merge heads

54e647f2 · Senthil Kumaran · 1dbb7591 · d417d01e · 54e647f2
Commit 54e647f2 authored Jun 20, 2011 by Senthil Kumaran
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Python/import.c Python/import.c +4 -0

No files found.
--- a/Python/import.c
+++ b/Python/import.c
@@ -3567,6 +3567,10 @@ call_find_module(PyObject *name, PyObject *path_list)
        if (fd != -1)
            fd = dup(fd);
        fclose(fp);
+        if (fd == -1) {
+            PyErr_SetFromErrno(PyExc_OSError);
+            return NULL;
+        }
        fp = NULL;
    }
    if (fd != -1) {