From 63c22fac727a72f0a4da8f72b12cd5f9b480376b Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 23 Sep 2011 19:37:03 +0200 Subject: 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). --- Python/import.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Python/import.c') diff --git a/Python/import.c b/Python/import.c index 673d1b3324..c60ecfea5e 100644 --- a/Python/import.c +++ b/Python/import.c @@ -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; -- cgit v1.2.1