traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Put checks for error returns in the right place.

This commit is contained in:
Jeremy Hylton 2002-07-25 16:37:51 +00:00
parent ead36d7874
commit 825e47b655
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/socketmodule.c
View File

@ -2475,9 +2475,13 @@ socket_ntohl(PyObject *self, PyObject *arg)
if (PyInt_Check(arg)) { if (PyInt_Check(arg)) {
x = PyInt_AS_LONG(arg); x = PyInt_AS_LONG(arg);
if (x == (unsigned long) -1 && PyErr_Occurred())
return NULL;
} }
else if (PyLong_Check(arg)) { else if (PyLong_Check(arg)) {
x = PyLong_AsUnsignedLong(arg); x = PyLong_AsUnsignedLong(arg);
if (x == (unsigned long) -1 && PyErr_Occurred())
return NULL;
#if SIZEOF_LONG > 4 #if SIZEOF_LONG > 4
{ {
unsigned long y; unsigned long y;
@ -2530,9 +2534,13 @@ socket_htonl(PyObject *self, PyObject *arg)
if (PyInt_Check(arg)) { if (PyInt_Check(arg)) {
x = PyInt_AS_LONG(arg); x = PyInt_AS_LONG(arg);
if (x == (unsigned long) -1 && PyErr_Occurred())
return NULL;
} }
else if (PyLong_Check(arg)) { else if (PyLong_Check(arg)) {
x = PyLong_AsUnsignedLong(arg); x = PyLong_AsUnsignedLong(arg);
if (x == (unsigned long) -1 && PyErr_Occurred())
return NULL;
#if SIZEOF_LONG > 4 #if SIZEOF_LONG > 4
{ {
unsigned long y; unsigned long y;
@ -2549,8 +2557,6 @@ socket_htonl(PyObject *self, PyObject *arg)
return PyErr_Format(PyExc_TypeError, return PyErr_Format(PyExc_TypeError,
"expected int/long, %s found", "expected int/long, %s found",
arg->ob_type->tp_name); arg->ob_type->tp_name);
if (x == (unsigned long) -1 && PyErr_Occurred())
return NULL;
return PyInt_FromLong(htonl(x)); return PyInt_FromLong(htonl(x));
} }