mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 53434 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r53434 | guido.van.rossum | 2007-01-14 09:03:32 -0800 (Sun, 14 Jan 2007) | 3 lines

  Patch #1635058 by Mark Roberts: ensure that htonl and friends never accept or
  return negative numbers, per the underlying C implementation.
........
This commit is contained in:
Guido van Rossum 2007-01-15 00:07:32 +00:00
parent 65eabe30e4
commit 018919aba8
3 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_socket.py
View file

@ -310,6 +310,20 @@ class GeneralModuleTests(unittest.TestCase):
self.assertEqual(swapped & mask, mask) self.assertEqual(swapped & mask, mask)
self.assertRaises(OverflowError, func, 1L<<34) self.assertRaises(OverflowError, func, 1L<<34)
def testNtoHErrors(self):
good_values = [ 1, 2, 3, 1L, 2L, 3L ]
bad_values = [ -1, -2, -3, -1L, -2L, -3L ]
for k in good_values:
socket.ntohl(k)
socket.ntohs(k)
socket.htonl(k)
socket.htons(k)
for k in bad_values:
self.assertRaises(OverflowError, socket.ntohl, k)
self.assertRaises(OverflowError, socket.ntohs, k)
self.assertRaises(OverflowError, socket.htonl, k)
self.assertRaises(OverflowError, socket.htons, k)
def testGetServBy(self): def testGetServBy(self):
eq = self.assertEqual eq = self.assertEqual
# Find one service that exists, then check all the related interfaces. # Find one service that exists, then check all the related interfaces.

1
Misc/ACKS
View file

@ -521,6 +521,7 @@ Armin Rigo
Nicholas Riley Nicholas Riley
Jean-Claude Rimbault Jean-Claude Rimbault
Anthony Roach Anthony Roach
Mark Roberts
Andy Robinson Andy Robinson
Jim Robinson Jim Robinson
Kevin Rodgers Kevin Rodgers

18
Modules/socketmodule.c
View file

@ -3468,7 +3468,12 @@ socket_ntohs(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "i:ntohs", &x1)) { if (!PyArg_ParseTuple(args, "i:ntohs", &x1)) {
return NULL; return NULL;
} }
x2 = (int)ntohs((short)x1); if (x1 < 0) {
PyErr_SetString(PyExc_OverflowError,
"can't convert negative number to unsigned long");
return NULL;
}
x2 = (unsigned int)ntohs((unsigned short)x1);
return PyInt_FromLong(x2); return PyInt_FromLong(x2);
} }
@ -3505,7 +3510,7 @@ socket_ntohl(PyObject *self, PyObject *arg)
arg->ob_type->tp_name); arg->ob_type->tp_name);
if (x == (unsigned long) -1 && PyErr_Occurred()) if (x == (unsigned long) -1 && PyErr_Occurred())
return NULL; return NULL;
return PyInt_FromLong(ntohl(x)); return PyLong_FromUnsignedLong(ntohl(x));
} }
PyDoc_STRVAR(ntohl_doc, PyDoc_STRVAR(ntohl_doc,
@ -3522,7 +3527,12 @@ socket_htons(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "i:htons", &x1)) { if (!PyArg_ParseTuple(args, "i:htons", &x1)) {
return NULL; return NULL;
} }
x2 = (int)htons((short)x1); if (x1 < 0) {
PyErr_SetString(PyExc_OverflowError,
"can't convert negative number to unsigned long");
return NULL;
}
x2 = (unsigned int)htons((unsigned short)x1);
return PyInt_FromLong(x2); return PyInt_FromLong(x2);
} }
@ -3557,7 +3567,7 @@ 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);
return PyInt_FromLong(htonl(x)); return PyLong_FromUnsignedLong(htonl((unsigned long)x));
} }
PyDoc_STRVAR(htonl_doc, PyDoc_STRVAR(htonl_doc,