From: Peter Astrand <astrand@lysator.liu.se>
Date: Sun, 7 Nov 2004 14:15:28 +0000 (+0000)
Subject: If close() fails in file_dealloc, then print an error message to
X-Git-Tag: v2.4c1~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8e74b12b00401b9cd6322fc339a1b9111e944df;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 34f28e32ac55..c08345c04d39 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);