From: Sergey G. Brester Date: Sun, 22 Jan 2023 08:10:00 +0000 (+0100) Subject: gh-100795: avoid unexpected `freeaddrinfo` after failed `getaddrinfo` (#101220) X-Git-Tag: v3.12.0a5~129 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f08fe4a2c055880c23c6f9b57ff03005d193bfc;p=thirdparty%2FPython%2Fcpython.git gh-100795: avoid unexpected `freeaddrinfo` after failed `getaddrinfo` (#101220) Co-authored-by: Oleg Iarygin --- diff --git a/Misc/NEWS.d/next/Library/2023-01-21-16-50-22.gh-issue-100795.NPMZf7.rst b/Misc/NEWS.d/next/Library/2023-01-21-16-50-22.gh-issue-100795.NPMZf7.rst new file mode 100644 index 000000000000..beec5c9e57f6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-01-21-16-50-22.gh-issue-100795.NPMZf7.rst @@ -0,0 +1,2 @@ +Avoid unexpected ``freeaddrinfo`` when :meth:`socket.socket.getaddrinfo` +fails. Patch by Sergey G. Brester. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 4747a23e8317..8659d725f2e3 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -6719,6 +6719,7 @@ socket_getaddrinfo(PyObject *self, PyObject *args, PyObject* kwargs) error = getaddrinfo(hptr, pptr, &hints, &res0); Py_END_ALLOW_THREADS if (error) { + res0 = NULL; /* avoid unexpected free if res0 becomes not NULL */ set_gaierror(error); goto err; } @@ -6815,6 +6816,7 @@ socket_getnameinfo(PyObject *self, PyObject *args) error = getaddrinfo(hostp, pbuf, &hints, &res); Py_END_ALLOW_THREADS if (error) { + res = NULL; /* avoid unexpected free if res becomes not NULL */ set_gaierror(error); goto fail; }