Issue #15895: Fix FILE pointer leak in PyRun_SimpleFileExFlags() when filename points...

diff --git a/Misc/NEWS b/Misc/NEWS
index 53d20f4a74e93cc71dee3d5d3e46846a689d9591..068c4b1307e866a5834c9fef490d5908b82220f8 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.3.1
 Core and Builtins
 -----------------
 
+- Issue #15895: Fix FILE pointer leak in PyRun_SimpleFileExFlags() when
+  filename points to a pyc/pyo file and closeit is false.
+
 - Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap().
 
 - Issue #15839: Convert SystemErrors in super() to RuntimeErrors.

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 05dfb8e1d0a983432d8071db7c7b3ef444e2ceb6..7e9f6545e267b1d9c74d9a6151f762b111094dbb 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1385,7 +1385,7 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
 {
     PyObject *m, *d, *v;
     const char *ext;
-    int set_file_name = 0, ret;
+    int set_file_name = 0, close_own_fp = 0, ret;
     size_t len;
 
     m = PyImport_AddModule("__main__");
@@ -1419,6 +1419,7 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
             ret = -1;
             goto done;
         }
+        close_own_fp = 1;
         /* Turn on optimization if a .pyo file is given */
         if (strcmp(ext, ".pyo") == 0)
             Py_OptimizeFlag = 1;
@@ -1449,6 +1450,9 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
     Py_DECREF(v);
     ret = 0;
   done:
+    if (close_own_fp) {
+        fclose(fp);
+    }
     if (set_file_name && PyDict_DelItemString(d, "__file__"))
         PyErr_Clear();
     return ret;