mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 14:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #7732: Fix a crash on importing a module if a directory has the same name

Browse source 
than a Python module (e.g. "__init__.py"): don't close the file twice.

PyFile_FromFile() does also close the file if PyString_FromString() failed. It
did already close the file on fill_file_fields() error (e.g. if the file is a
directory).
This commit is contained in:
Victor Stinner 2011-09-23 19:37:03 +02:00
parent 51b719814e
commit 63c22fac72
5 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/import.c
View file

@ -2845,10 +2845,8 @@ call_find_module(char *name, PyObject *path)
return NULL;
if (fp != NULL) {
fob = PyFile_FromFile(fp, pathname, fdp->mode, fclose);
if (fob == NULL) {
fclose(fp);
if (fob == NULL)
return NULL;
}
}
else {
fob = Py_None;