summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2012-09-11 12:11:03 (GMT)
committerChristian Heimes <christian@cheimes.de>2012-09-11 12:11:03 (GMT)
commit6a77af690fc5022ecd218771960d15af2dc74977 (patch)
treeb0e84ce9b24eef4c6fca47ed4603d3ed25f6df43 /Python
parent26b9f4b2f324cd5767d8fe9a2ab85566f34be809 (diff)
downloadcpython-6a77af690fc5022ecd218771960d15af2dc74977.zip
cpython-6a77af690fc5022ecd218771960d15af2dc74977.tar.gz
cpython-6a77af690fc5022ecd218771960d15af2dc74977.tar.bz2
Issue #15895: Fix FILE pointer leak in PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file and closeit is false.
Diffstat (limited to 'Python')
-rw-r--r--Python/pythonrun.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 05dfb8e..7e9f654 100644
--- 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;