Author: guido.van.rossum
Date: Thu Aug 9 23:06:37 2007
New Revision: 56874
Modified:
python/branches/py3k/Modules/socketmodule.c
Log:
Fix two bugs in socket_getaddr():
(a) 'single' shouldn't be DECREF'ed in the cleanup code;
(b) the fallback case in makesockaddr() should use y# instead of s#
in the format, since the data is bytes, not UTF-8 text.
Modified: python/branches/py3k/Modules/socketmodule.c
==============================================================================
--- python/branches/py3k/Modules/socketmodule.c (original)
+++ python/branches/py3k/Modules/socketmodule.c Thu Aug 9 23:06:37 2007
@@ -1174,8 +1174,8 @@
default:
/* If we don't know the address family, don't raise an
- exception -- return it as a tuple. */
- return Py_BuildValue("is#",
+ exception -- return it as an (int, bytes) tuple. */
+ return Py_BuildValue("iy#",
addr->sa_family,
addr->sa_data,
sizeof(addr->sa_data));
@@ -3743,7 +3743,6 @@
int family, socktype, protocol, flags;
int error;
PyObject *all = (PyObject *)NULL;
- PyObject *single = (PyObject *)NULL;
PyObject *idna = NULL;
family = socktype = protocol = flags = 0;
@@ -3797,6 +3796,7 @@
if ((all = PyList_New(0)) == NULL)
goto err;
for (res = res0; res; res = res->ai_next) {
+ PyObject *single;
PyObject *addr =
makesockaddr(-1, res->ai_addr, res->ai_addrlen,
protocol);
if (addr == NULL)
@@ -3818,7 +3818,6 @@
freeaddrinfo(res0);
return all;
err:
- Py_XDECREF(single);
Py_XDECREF(all);
Py_XDECREF(idna);
if (res0)
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
