summaryrefslogtreecommitdiffstats
path: root/Objects/fileobject.c
diff options
context:
space:
mode:
Diffstat (limited to 'Objects/fileobject.c')
-rw-r--r--Objects/fileobject.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index f2aeb9d..8ebb482 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -2136,7 +2136,7 @@ PyFile_SoftSpace(PyObject *f, int newflag)
if (v == NULL)
PyErr_Clear();
else {
- if (PyInt_Check(v))
+ if (PyInt_CheckExact(v))
oldflag = PyInt_AsLong(v);
assert(oldflag < INT_MAX);
Py_DECREF(v);
@@ -2301,6 +2301,8 @@ int PyObject_AsFileDescriptor(PyObject *o)
return -1;
}
+ if (fd == -1 && PyErr_Occurred())
+ return -1;
if (fd < 0) {
PyErr_Format(PyExc_ValueError,
"file descriptor cannot be a negative integer (%i)",