merge 3.4

This commit is contained in:
Benjamin Peterson 2015-04-01 12:37:34 -04:00
commit 81541f4480

View file

@ -5429,7 +5429,8 @@ socket_getaddrinfo(PyObject *self, PyObject *args, PyObject* kwargs)
goto err;
}
if ((all = PyList_New(0)) == NULL)
all = PyList_New(0);
if (all == NULL)
goto err;
for (res = res0; res; res = res->ai_next) {
PyObject *single;