diff options
author | Christian Heimes <christian@cheimes.de> | 2012-09-11 14:11:03 +0200 |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2012-09-11 14:11:03 +0200 |
commit | e9af11a58c7e0d1facc54f24a97cf1ecbf3a56bb (patch) | |
tree | f16e6dcce3f4c89f8a4d73fb280cd625fde3fe86 /Python/pythonrun.c | |
parent | 555b96ac1846b6a7ca7e2a34b1623e9ec9420777 (diff) | |
download | cpython-e9af11a58c7e0d1facc54f24a97cf1ecbf3a56bb.tar.gz |
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/pythonrun.c')
-rw-r--r-- | Python/pythonrun.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 05dfb8e1d0..7e9f6545e2 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; |