Merged revisions 81275 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81275 | antoine.pitrou | 2010-05-17 21:56:59 +0200 (lun., 17 mai 2010) | 4 lines
Issue #7079: Fix a possible crash when closing a file object while using
it from another thread. Patch by Daniel Stutzbach.
........
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index b9d9097..df5a102 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -568,8 +568,10 @@
file_close(PyFileObject *f)
{
PyObject *sts = close_the_file(f);
- PyMem_Free(f->f_setbuf);
- f->f_setbuf = NULL;
+ if (sts) {
+ PyMem_Free(f->f_setbuf);
+ f->f_setbuf = NULL;
+ }
return sts;
}