summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-01-18 00:10:37 -0500
committerBenjamin Peterson <benjamin@python.org>2013-01-18 00:10:37 -0500
commite9ee57ccb1906ab1cbaf66f8229e480185c6b4fa (patch)
tree79350bdbe61b38d722020e4469264c4a472fd784 /Modules
parentb6471832f11a4305c4e35f6c9dd2895c12bf617d (diff)
parente701a0b51a1b9a96aa8e4e8c0a46e2866ad592a9 (diff)
downloadcpython-e9ee57ccb1906ab1cbaf66f8229e480185c6b4fa.tar.gz
merge 3.3
Diffstat (limited to 'Modules')
-rw-r--r--Modules/signalmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index d633301c67..bbaf9a3492 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -422,7 +422,7 @@ signal_set_wakeup_fd(PyObject *self, PyObject *args)
return NULL;
}
#endif
- if (fd != -1 && fstat(fd, &buf) != 0) {
+ if (fd != -1 && (!_PyVerify_fd(fd) || fstat(fd, &buf) != 0)) {
PyErr_SetString(PyExc_ValueError, "invalid fd");
return NULL;
}