[Python-checkins] r85687 - python/branches/py3k/Modules/zipimport.c
victor.stinner
python-checkins at python.org
Mon Oct 18 14:03:26 CEST 2010
Author: victor.stinner
Date: Mon Oct 18 14:03:25 2010
New Revision: 85687
Log:
zipimporter_load_module() doesn't destroy mod on error
PyImport_AddModule() returns a borrowed reference. Don't display "import ... #
loaded from Zip ..." on error.
Modified:
python/branches/py3k/Modules/zipimport.c
Modified: python/branches/py3k/Modules/zipimport.c
==============================================================================
--- python/branches/py3k/Modules/zipimport.c (original)
+++ python/branches/py3k/Modules/zipimport.c Mon Oct 18 14:03:25 2010
@@ -309,7 +309,7 @@
zipimporter_load_module(PyObject *obj, PyObject *args)
{
ZipImporter *self = (ZipImporter *)obj;
- PyObject *code, *mod, *dict;
+ PyObject *code = NULL, *mod, *dict;
char *fullname, *modpath;
int ispackage;
@@ -319,13 +319,11 @@
code = get_module_code(self, fullname, &ispackage, &modpath);
if (code == NULL)
- return NULL;
+ goto error;
mod = PyImport_AddModule(fullname);
- if (mod == NULL) {
- Py_DECREF(code);
- return NULL;
- }
+ if (mod == NULL)
+ goto error;
dict = PyModule_GetDict(mod);
/* mod.__loader__ = self */
@@ -355,14 +353,16 @@
goto error;
}
mod = PyImport_ExecCodeModuleEx(fullname, code, modpath);
- Py_DECREF(code);
+ Py_CLEAR(code);
+ if (mod == NULL)
+ goto error;
+
if (Py_VerboseFlag)
PySys_WriteStderr("import %s # loaded from Zip %s\n",
fullname, modpath);
return mod;
error:
- Py_DECREF(code);
- Py_DECREF(mod);
+ Py_XDECREF(code);
return NULL;
}
More information about the Python-checkins
mailing list