changeset: 72456:0f5b64630fda branch: 2.7 parent: 72450:c02e790c4535 user: Victor Stinner date: Fri Sep 23 19:37:03 2011 +0200 files: Doc/c-api/file.rst Lib/test/test_import.py Misc/NEWS Objects/fileobject.c Python/import.c description: Issue #7732: Fix a crash on importing a module if a directory has the same name 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). diff -r c02e790c4535 -r 0f5b64630fda Doc/c-api/file.rst --- a/Doc/c-api/file.rst Fri Sep 23 01:15:32 2011 +0200 +++ b/Doc/c-api/file.rst Fri Sep 23 19:37:03 2011 +0200 @@ -55,7 +55,8 @@ Create a new :ctype:`PyFileObject` from the already-open standard C file pointer, *fp*. The function *close* will be called when the file should be - closed. Return *NULL* on failure. + closed. Return *NULL* and close the file using *close* on failure. + *close* is optional and can be set to *NULL*. .. cfunction:: FILE* PyFile_AsFile(PyObject \*p) diff -r c02e790c4535 -r 0f5b64630fda Lib/test/test_import.py --- a/Lib/test/test_import.py Fri Sep 23 01:15:32 2011 +0200 +++ b/Lib/test/test_import.py Fri Sep 23 19:37:03 2011 +0200 @@ -265,6 +265,14 @@ """)) script_helper.assert_python_ok(testfn) + def test_bug7732(self): + source = TESTFN + '.py' + os.mkdir(source) + try: + self.assertRaises(IOError, imp.find_module, TESTFN, ["."]) + finally: + os.rmdir(source) + class PycRewritingTests(unittest.TestCase): # Test that the `co_filename` attribute on code objects always points diff -r c02e790c4535 -r 0f5b64630fda Misc/NEWS --- a/Misc/NEWS Fri Sep 23 01:15:32 2011 +0200 +++ b/Misc/NEWS Fri Sep 23 19:37:03 2011 +0200 @@ -9,6 +9,9 @@ Core and Builtins ----------------- +- Issue #7732: Fix a crash on importing a module if a directory has the same + name than a Python module (e.g. "__init__.py"): don't close the file twice. + - Issue #12973: Fix overflow checks that invoked undefined behaviour in int.__pow__. These overflow checks were causing int.__pow__ to produce incorrect results with recent versions of Clang, as a result of the diff -r c02e790c4535 -r 0f5b64630fda Objects/fileobject.c --- a/Objects/fileobject.c Fri Sep 23 01:15:32 2011 +0200 +++ b/Objects/fileobject.c Fri Sep 23 19:37:03 2011 +0200 @@ -468,28 +468,34 @@ PyObject * PyFile_FromFile(FILE *fp, char *name, char *mode, int (*close)(FILE *)) { - PyFileObject *f = (PyFileObject *)PyFile_Type.tp_new(&PyFile_Type, - NULL, NULL); - if (f != NULL) { - PyObject *o_name = PyString_FromString(name); - if (o_name == NULL) - return NULL; - if (fill_file_fields(f, fp, o_name, mode, close) == NULL) { - Py_DECREF(f); - f = NULL; - } + PyFileObject *f; + PyObject *o_name; + + f = (PyFileObject *)PyFile_Type.tp_new(&PyFile_Type, NULL, NULL); + if (f == NULL) + return NULL; + o_name = PyString_FromString(name); + if (o_name == NULL) { + if (close != NULL && fp != NULL) + close(fp); + Py_DECREF(f); + return NULL; + } + if (fill_file_fields(f, fp, o_name, mode, close) == NULL) { + Py_DECREF(f); Py_DECREF(o_name); + return NULL; } - return (PyObject *) f; + Py_DECREF(o_name); + return (PyObject *)f; } PyObject * PyFile_FromString(char *name, char *mode) { - extern int fclose(FILE *); PyFileObject *f; - f = (PyFileObject *)PyFile_FromFile((FILE *)NULL, name, mode, fclose); + f = (PyFileObject *)PyFile_FromFile((FILE *)NULL, name, mode, NULL); if (f != NULL) { if (open_the_file(f, name, mode) == NULL) { Py_DECREF(f); diff -r c02e790c4535 -r 0f5b64630fda Python/import.c --- a/Python/import.c Fri Sep 23 01:15:32 2011 +0200 +++ b/Python/import.c Fri Sep 23 19:37:03 2011 +0200 @@ -2845,10 +2845,8 @@ 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;