summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-02-16 19:11:56 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-02-16 19:11:56 (GMT)
commitc20b4d872d5e2a705afb46dc954ef9ca1146109b (patch)
tree9336dbde2fd0ac9a0eb9a5164ece48fd939d7ca3
parent0b094ce17072c33b3bdf01b01aab4d42e6e84720 (diff)
downloadcpython-c20b4d872d5e2a705afb46dc954ef9ca1146109b.zip
cpython-c20b4d872d5e2a705afb46dc954ef9ca1146109b.tar.gz
cpython-c20b4d872d5e2a705afb46dc954ef9ca1146109b.tar.bz2
backout d28242a636c7 so I can backout 2807a5f011e4
-rw-r--r--Modules/zipimport.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index fc6c0e4..bfac462 100644
--- 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;