mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-15 11:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-100795: avoid unexpected freeaddrinfo after failed getaddrinfo (#101220)

Browse source 
Co-authored-by: Oleg Iarygin <dralife@yandex.ru>
This commit is contained in:
Sergey G. Brester 2023-01-22 09:10:00 +01:00 • committed by GitHub
parent 95f5b05a8c
commit 5f08fe4a2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Library/2023-01-21-16-50-22.gh-issue-100795.NPMZf7.rst Normal file
View file

@ -0,0 +1,2 @@
Avoid unexpected ``freeaddrinfo`` when :meth:`socket.socket.getaddrinfo`
fails. Patch by Sergey G. Brester.

2
Modules/socketmodule.c
View file

@ -6719,6 +6719,7 @@ socket_getaddrinfo(PyObject *self, PyObject *args, PyObject* kwargs)
error = getaddrinfo(hptr, pptr, &hints, &res0); error = getaddrinfo(hptr, pptr, &hints, &res0);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (error) { if (error) {
res0 = NULL; /* avoid unexpected free if res0 becomes not NULL */
set_gaierror(error); set_gaierror(error);
goto err; goto err;
} }
@ -6815,6 +6816,7 @@ socket_getnameinfo(PyObject *self, PyObject *args)
error = getaddrinfo(hostp, pbuf, &hints, &res); error = getaddrinfo(hostp, pbuf, &hints, &res);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (error) { if (error) {
res = NULL; /* avoid unexpected free if res becomes not NULL */
set_gaierror(error); set_gaierror(error);
goto fail; goto fail;
} }