[Python-checkins] cpython (merge 3.3 -> default): (3.3->default) Issue #17269: Workaround for a platform bug in getaddrinfo on OSX
ronald.oussoren
python-checkins at python.org
Fri May 24 13:51:40 CEST 2013
http://hg.python.org/cpython/rev/24ffb0148729
changeset: 83908:24ffb0148729
parent: 83905:f7992397e98d
parent: 83907:3c4a5dc29417
user: Ronald Oussoren <ronaldoussoren at mac.com>
date: Fri May 24 13:51:21 2013 +0200
summary:
(3.3->default) Issue #17269: Workaround for a platform bug in getaddrinfo on OSX
Without this patch socket.getaddrinfo crashed when called
with some unusual argument combinations.
files:
Lib/test/test_socket.py | 3 +++
Misc/NEWS | 3 +++
Modules/socketmodule.c | 9 +++++++++
3 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1201,6 +1201,9 @@
# Issue #6697.
self.assertRaises(UnicodeEncodeError, socket.getaddrinfo, 'localhost', '\uD800')
+ # Issue 17269
+ socket.getaddrinfo("localhost", None, 0, 0, 0, socket.AI_NUMERICSERV)
+
def test_getnameinfo(self):
# only IP addresses are allowed
self.assertRaises(OSError, socket.getnameinfo, ('mail.python.org',0), 0)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -96,6 +96,9 @@
Library
-------
+- Issue #17269: Workaround for socket.getaddrinfo crash on MacOS X
+ with port None or "0" and flags AI_NUMERICSERV.
+
- Issue #16986: ElementTree now correctly parses a string input not only when
an internal XML encoding is UTF-8 or US-ASCII.
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -4978,6 +4978,15 @@
PyErr_SetString(PyExc_OSError, "Int or String expected");
goto err;
}
+#ifdef __APPLE__
+ if ((flags & AI_NUMERICSERV) && (pptr == NULL || (pptr[0] == '0' && pptr[1] == 0))) {
+ /* On OSX upto at least OSX 10.8 getaddrinfo crashes
+ * if AI_NUMERICSERV is set and the servname is NULL or "0".
+ * This workaround avoids a segfault in libsystem.
+ */
+ pptr = "00";
+ }
+#endif
memset(&hints, 0, sizeof(hints));
hints.ai_family = family;
hints.ai_socktype = socktype;
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list