diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2013-05-24 11:51:21 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2013-05-24 11:51:21 (GMT) |
| commit | dc3e6cc452a2a4409a4d12804fab4e474abbf9ff (patch) | |
| tree | d569856625cff5f0a4b80e70a2e33c3db9cf4180 | |
| parent | cbc77bbbc0d0cbdb50889f556b9a514870481314 (diff) | |
| parent | 27a4ac535f112b87d91f433eb9edcd0ae9988354 (diff) | |
| download | cpython-dc3e6cc452a2a4409a4d12804fab4e474abbf9ff.zip cpython-dc3e6cc452a2a4409a4d12804fab4e474abbf9ff.tar.gz cpython-dc3e6cc452a2a4409a4d12804fab4e474abbf9ff.tar.bz2 | |
(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.
| -rw-r--r-- | Lib/test/test_socket.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | 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 index 546d793..a2de398 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1201,6 +1201,9 @@ class GeneralModuleTests(unittest.TestCase): # 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) @@ -96,6 +96,9 @@ Core and Builtins 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 index fa75a10..846d659 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -4978,6 +4978,15 @@ socket_getaddrinfo(PyObject *self, PyObject *args, PyObject* kwargs) 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; |