mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-22 14:42:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #18549: Eliminate dead code in socket_ntohl().

Browse source 
CID 982369
This commit is contained in:
Christian Heimes 2013-07-25 11:46:10 +02:00
parent b042daa5a7
commit 9228837e31
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -52,6 +52,8 @@ Core and Builtins
Library Library
------- -------
- Issue #18549: Eliminate dead code in socket_ntohl()
- Issue #18514: Fix unreachable Py_DECREF() call in PyCData_FromBaseObj() - Issue #18514: Fix unreachable Py_DECREF() call in PyCData_FromBaseObj()
- Issue #18513: Fix behaviour of cmath.rect w.r.t. signed zeros on OS X 10.8 + - Issue #18513: Fix behaviour of cmath.rect w.r.t. signed zeros on OS X 10.8 +

2
Modules/socketmodule.c
View file

@ -4702,8 +4702,6 @@ socket_ntohl(PyObject *self, PyObject *arg)
return PyErr_Format(PyExc_TypeError, return PyErr_Format(PyExc_TypeError,
"expected int/long, %s found", "expected int/long, %s found",
Py_TYPE(arg)->tp_name); Py_TYPE(arg)->tp_name);
if (x == (unsigned long) -1 && PyErr_Occurred())
return NULL;
return PyLong_FromUnsignedLong(ntohl(x)); return PyLong_FromUnsignedLong(ntohl(x));
} }