summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-04-01 16:37:34 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-04-01 16:37:34 (GMT)
commit81541f448066142c04fae736c3dda23b184c32be (patch)
tree7b0c36246f727440a9d6d3e6736cf33c687bcb2e /Modules
parent62d1c70eff9498446d2ce3c564fefee7a7e54770 (diff)
parent4fd929b431214678184bddc7a5bb5c610dda5485 (diff)
downloadcpython-81541f448066142c04fae736c3dda23b184c32be.zip
cpython-81541f448066142c04fae736c3dda23b184c32be.tar.gz
cpython-81541f448066142c04fae736c3dda23b184c32be.tar.bz2
merge 3.4
Diffstat (limited to 'Modules')
-rw-r--r--Modules/socketmodule.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index fcb1ff4..64db006 100644
--- 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;