summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2005-11-03 05:00:25 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2005-11-03 05:00:25 (GMT)
commit0f46bbf7814476de107d16f67561d611d900f5a3 (patch)
tree239a33d35dcda550ee11dcc8602f1dc83fba9e00 /Modules
parent26f4c23074565ee46f6853138868a148b8ad7988 (diff)
downloadcpython-0f46bbf7814476de107d16f67561d611d900f5a3.zip
cpython-0f46bbf7814476de107d16f67561d611d900f5a3.tar.gz
cpython-0f46bbf7814476de107d16f67561d611d900f5a3.tar.bz2
Bug #1346533, select.poll() doesn't raise an error if timeout > sys.maxint
Need to check return result of PyInt_AsLong() Will backport.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/selectmodule.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 81c9e3c..ed2ea81 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -470,6 +470,8 @@ poll_poll(pollObject *self, PyObject *args)
return NULL;
timeout = PyInt_AsLong(tout);
Py_DECREF(tout);
+ if (timeout == -1 && PyErr_Occurred())
+ return NULL;
}
/* Ensure the ufd array is up to date */