Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #15895: my analysis was slightly off. The FILE pointer is only leaked when set_main_loader() fails for a pyc file with closeit=0. In the success case run_pyc_file() does its own cleanup of the fp. I've changed the code to use another FILE ptr for pyc files and moved the fclose() to PyRun_SimpleFileExFlags() to make it more obvious what's happening.

This commit is contained in:
Christian Heimes 2012-09-11 15:47:28 +02:00
parent 6a77af690f
commit 6d29352cfd
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -10,7 +10,8 @@ What's New in Python 3.3.1
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #15895: Fix FILE pointer leak in PyRun_SimpleFileExFlags() when - Issue #15895: Fix FILE pointer leak in one error branch of
PyRun_SimpleFileExFlags() when
filename points to a pyc/pyo file and closeit is false. filename points to a pyc/pyo file and closeit is false.
- Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap(). - Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap().

14
Python/pythonrun.c
View File

@ -1385,7 +1385,7 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
{ {
PyObject *m, *d, *v; PyObject *m, *d, *v;
const char *ext; const char *ext;
int set_file_name = 0, close_own_fp = 0, ret; int set_file_name = 0, ret;
size_t len; size_t len;
m = PyImport_AddModule("__main__"); m = PyImport_AddModule("__main__");
@ -1411,15 +1411,15 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
len = strlen(filename); len = strlen(filename);
ext = filename + len - (len > 4 ? 4 : 0); ext = filename + len - (len > 4 ? 4 : 0);
if (maybe_pyc_file(fp, filename, ext, closeit)) { if (maybe_pyc_file(fp, filename, ext, closeit)) {
FILE *pyc_fp;
/* Try to run a pyc file. First, re-open in binary */ /* Try to run a pyc file. First, re-open in binary */
if (closeit) if (closeit)
fclose(fp); fclose(fp);
if ((fp = fopen(filename, "rb")) == NULL) { if ((pyc_fp = fopen(filename, "rb")) == NULL) {
fprintf(stderr, "python: Can't reopen .pyc file\n"); fprintf(stderr, "python: Can't reopen .pyc file\n");
ret = -1; ret = -1;
goto done; goto done;
} }
close_own_fp = 1;
/* Turn on optimization if a .pyo file is given */ /* Turn on optimization if a .pyo file is given */
if (strcmp(ext, ".pyo") == 0) if (strcmp(ext, ".pyo") == 0)
Py_OptimizeFlag = 1; Py_OptimizeFlag = 1;
@ -1427,9 +1427,11 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
if (set_main_loader(d, filename, "SourcelessFileLoader") < 0) { if (set_main_loader(d, filename, "SourcelessFileLoader") < 0) {
fprintf(stderr, "python: failed to set __main__.__loader__\n"); fprintf(stderr, "python: failed to set __main__.__loader__\n");
ret = -1; ret = -1;
fclose(pyc_fp);
goto done; goto done;
} }
v = run_pyc_file(fp, filename, d, d, flags); v = run_pyc_file(pyc_fp, filename, d, d, flags);
fclose(pyc_fp);
} else { } else {
/* When running from stdin, leave __main__.__loader__ alone */ /* When running from stdin, leave __main__.__loader__ alone */
if (strcmp(filename, "<stdin>") != 0 && if (strcmp(filename, "<stdin>") != 0 &&
@ -1450,9 +1452,6 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
Py_DECREF(v); Py_DECREF(v);
ret = 0; ret = 0;
done: done:
if (close_own_fp) {
fclose(fp);
}
if (set_file_name && PyDict_DelItemString(d, "__file__")) if (set_file_name && PyDict_DelItemString(d, "__file__"))
PyErr_Clear(); PyErr_Clear();
return ret; return ret;
@ -1999,7 +1998,6 @@ run_pyc_file(FILE *fp, const char *filename, PyObject *globals,
(void) PyMarshal_ReadLongFromFile(fp); (void) PyMarshal_ReadLongFromFile(fp);
(void) PyMarshal_ReadLongFromFile(fp); (void) PyMarshal_ReadLongFromFile(fp);
v = PyMarshal_ReadLastObjectFromFile(fp); v = PyMarshal_ReadLastObjectFromFile(fp);
fclose(fp);
if (v == NULL || !PyCode_Check(v)) { if (v == NULL || !PyCode_Check(v)) {
Py_XDECREF(v); Py_XDECREF(v);
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_RuntimeError,