merge 3.4

81541f44 · Benjamin Peterson · 62d1c70e · 4fd929b4 · 81541f44
Commit 81541f44 authored Apr 01, 2015 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Modules/socketmodule.c Modules/socketmodule.c +2 -1

No files found.
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -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;