merge 3.3

26421ab3 · Benjamin Peterson · a3852ff3 · 7d28b6b3 · 26421ab3
Kaydet (Commit) 26421ab3 authored Tem 23, 2013 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

dynload_shlib.c Python/dynload_shlib.c +2 -1

No files found.
--- a/Python/dynload_shlib.c
+++ b/Python/dynload_shlib.c
@@ -82,7 +82,8 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
        int i;
        struct stat statb;
        if (fstat(fileno(fp), &statb) == -1) {
-            return PyErr_SetFromErrno(PyExc_IOError);
+            PyErr_SetFromErrno(PyExc_IOError);
+            return NULL;
        }
        for (i = 0; i < nhandles; i++) {
            if (statb.st_dev == handles[i].dev &&