summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <mdickinson@enthought.com>2012-06-23 08:28:08 (GMT)
committerMark Dickinson <mdickinson@enthought.com>2012-06-23 08:28:08 (GMT)
commit970da4549ab78ad6f89dd0cce0d2defc771e1c72 (patch)
treec41c3d2b7d01fcb943b9171d2a3cac835a33905d
parentbe4fb692010db30a0818748153dfa1f3c21eaa7c (diff)
parentf8f5237b2f0579631cf53ddf1e76fb1e4c31dc52 (diff)
downloadcpython-970da4549ab78ad6f89dd0cce0d2defc771e1c72.zip
cpython-970da4549ab78ad6f89dd0cce0d2defc771e1c72.tar.gz
cpython-970da4549ab78ad6f89dd0cce0d2defc771e1c72.tar.bz2
merge
-rw-r--r--Modules/socketmodule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 936e930..804e09e 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1437,7 +1437,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
"getsockaddrarg: port must be 0-65535.");
return 0;
}
- if (flowinfo < 0 || flowinfo > 0xfffff) {
+ if (flowinfo > 0xfffff) {
PyErr_SetString(
PyExc_OverflowError,
"getsockaddrarg: flowinfo must be 0-1048575.");
@@ -5119,7 +5119,7 @@ socket_getnameinfo(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(sa, "si|II",
&hostp, &port, &flowinfo, &scope_id))
return NULL;
- if (flowinfo < 0 || flowinfo > 0xfffff) {
+ if (flowinfo > 0xfffff) {
PyErr_SetString(PyExc_OverflowError,
"getsockaddrarg: flowinfo must be 0-1048575.");
return NULL;