Issue #14505: Fix file descriptor leak when deallocating file objects created with PyFile_FromString().

This commit is contained in:
Antoine Pitrou 2012-04-05 14:07:52 +02:00
parent b45c5e2d0e
commit 02a380105d
2 changed files with 5 additions and 1 deletions

View file

@ -9,6 +9,9 @@ What's New in Python 2.7.4
Core and Builtins
-----------------
- Issue #14505: Fix file descriptor leak when deallocating file objects
created with PyFile_FromString().
- Issue #14474: Save and restore exception state in thread.start_new_thread()
while writing error message if the thread leaves a unhandled exception.

View file

@ -493,9 +493,10 @@ PyFile_FromFile(FILE *fp, char *name, char *mode, int (*close)(FILE *))
PyObject *
PyFile_FromString(char *name, char *mode)
{
extern int fclose(FILE *);
PyFileObject *f;
f = (PyFileObject *)PyFile_FromFile((FILE *)NULL, name, mode, NULL);
f = (PyFileObject *)PyFile_FromFile((FILE *)NULL, name, mode, fclose);
if (f != NULL) {
if (open_the_file(f, name, mode) == NULL) {
Py_DECREF(f);