Mercurial > cpython-lru_cache-weakref

diff Modules/socketmodule.c @ 20389:b47168178d87 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PySocket_getaddrinfo(): fix two refcount bugs, both having to do with a misunderstanding of the refcont behavior of the 'O' format code in PyArg_ParseTuple() and Py_BuildValue(), respectively. - pobj is only a borrowed reference, so should *not* be DECREF'ed at the end. This was the cause of SF bug #470635. - The Py_BuildValue() call would leak the object produced by makesockaddr(). (I found this by eyeballing the code.)
author Guido van Rossum <guido@python.org>
date Fri, 12 Oct 2001 18:59:27 +0000
parents 2f89b344fdb3
children 698bf7c22bfe
line wrap: on
line diff
--- a/Modules/socketmodule.c	Fri Oct 12 17:43:43 2001 +0000
+++ b/Modules/socketmodule.c	Fri Oct 12 18:59:27 2001 +0000
@@ -2377,10 +2377,15 @@
 	if ((all = PyList_New(0)) == NULL)
 		goto err;
 	for (res = res0; res; res = res->ai_next) {
+		PyObject *addr =
+			makesockaddr(-1, res->ai_addr, res->ai_addrlen);
+		if (addr == NULL)
+			goto err;
 		single = Py_BuildValue("iiisO", res->ai_family,
 			res->ai_socktype, res->ai_protocol,
 			res->ai_canonname ? res->ai_canonname : "",
-			makesockaddr(-1, res->ai_addr, res->ai_addrlen));
+			addr);
+		Py_DECREF(addr);
 		if (single == NULL)
 			goto err;
 
@@ -2388,12 +2393,10 @@
 			goto err;
 		Py_XDECREF(single);
 	}
-	Py_XDECREF(pobj);
 	return all;
  err:
 	Py_XDECREF(single);
 	Py_XDECREF(all);
-	Py_XDECREF(pobj);
 	return (PyObject *)NULL;
 }