backout d28242a636c7 so I can backout 2807a5f011e4

benjaminp · benjaminp · commit c20b4d872d5e · 2014-02-16T14:11:56.000-05:00
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
@@ -958,8 +958,10 @@ safely_reopen_archive(ZipImporter *self)
             }
             Py_XDECREF(self->files);  /* free the old value. */
             self->files = files;
+        } else {
+            /* No problem, discard the new stat data. */
+            Py_DECREF(stat_now);
         }
-        Py_DECREF(stat_now);
     }  /* stat succeeded */
 
     return fp;

Original file line number	Diff line number	Diff line change
`@@ -958,8 +958,10 @@ safely_reopen_archive(ZipImporter *self)`
`958`	`958`	`}`
`959`	`959`	`Py_XDECREF(self->files); /* free the old value. */`
`960`	`960`	`self->files = files;`
	`961`	`+ } else {`
	`962`	`+ /* No problem, discard the new stat data. */`
	`963`	`+ Py_DECREF(stat_now);`
`961`	`964`	`}`
`962`		`- Py_DECREF(stat_now);`
`963`	`965`	`} /* stat succeeded */`
`964`	`966`
`965`	`967`	`return fp;`