summaryrefslogtreecommitdiff
path: root/Objects
diff options
context:
space:
mode:
authorPeter Astrand <astrand@lysator.liu.se>2004-11-07 14:15:28 +0000
committerPeter Astrand <astrand@lysator.liu.se>2004-11-07 14:15:28 +0000
commite8ba808a08e48caf99aae846779b84c647583fdc (patch)
treee36a5ae0bd4f2fe06765fa86c9582ca714d35329 /Objects
parentdd56ccde7368a26a98a3c5926f519c78cdb74df3 (diff)
downloadcpython-e8ba808a08e48caf99aae846779b84c647583fdc.tar.gz
If close() fails in file_dealloc, then print an error message to
stderr. close() can fail if the user is out-of-quota, for example. Fixes #959379.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/fileobject.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 34f28e32ac..c08345c04d 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -300,12 +300,19 @@ static void drop_readahead(PyFileObject *);
static void
file_dealloc(PyFileObject *f)
{
+ int sts = 0;
if (f->weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *) f);
if (f->f_fp != NULL && f->f_close != NULL) {
Py_BEGIN_ALLOW_THREADS
- (*f->f_close)(f->f_fp);
+ sts = (*f->f_close)(f->f_fp);
Py_END_ALLOW_THREADS
+ if (sts == EOF)
+#ifdef HAVE_STRERROR
+ PySys_WriteStderr("close failed: [Errno %d] %s\n", errno, strerror(errno));
+#else
+ PySys_WriteStderr("close failed: [Errno %d]\n", errno);
+#endif
}
PyMem_Free(f->f_setbuf);
Py_XDECREF(f->f_name);