merge 3.4

benjaminp · benjaminp · commit 81541f448066 · 2015-04-01T12:37:34.000-04:00
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -5429,7 +5429,8 @@ socket_getaddrinfo(PyObject self, PyObject args, PyObject* kwargs)`
`5429`	`5429`	`goto err;`
`5430`	`5430`	`}`
`5431`	`5431`
`5432`		`- if ((all = PyList_New(0)) == NULL)`
	`5432`	`+ all = PyList_New(0);`
	`5433`	`+ if (all == NULL)`
`5433`	`5434`	`goto err;`
`5434`	`5435`	`for (res = res0; res; res = res->ai_next) {`
`5435`	`5436`	`PyObject *single;`