[Python-checkins] r51247 - python/trunk/Python/import.c
neal.norwitz
python-checkins at python.org
Sun Aug 13 20:10:47 CEST 2006
Author: neal.norwitz
Date: Sun Aug 13 20:10:47 2006
New Revision: 51247
Modified:
python/trunk/Python/import.c
Log:
cpathname could be NULL if it was longer than MAXPATHLEN. Don't try
to write the .pyc to NULL.
Check results of PyList_GetItem() and PyModule_GetDict() are not NULL.
Klocwork 282, 283, 285
Modified: python/trunk/Python/import.c
==============================================================================
--- python/trunk/Python/import.c (original)
+++ python/trunk/Python/import.c Sun Aug 13 20:10:47 2006
@@ -933,7 +933,8 @@
if (Py_VerboseFlag)
PySys_WriteStderr("import %s # from %s\n",
name, pathname);
- write_compiled_module(co, cpathname, mtime);
+ if (cpathname)
+ write_compiled_module(co, cpathname, mtime);
}
m = PyImport_ExecCodeModuleEx(name, (PyObject *)co, pathname);
Py_DECREF(co);
@@ -1232,6 +1233,8 @@
for (i = 0; i < npath; i++) {
PyObject *copy = NULL;
PyObject *v = PyList_GetItem(path, i);
+ if (!v)
+ return NULL;
#ifdef Py_USING_UNICODE
if (PyUnicode_Check(v)) {
copy = PyUnicode_Encode(PyUnicode_AS_UNICODE(v),
@@ -3044,6 +3047,8 @@
if (m == NULL)
goto failure;
d = PyModule_GetDict(m);
+ if (d == NULL)
+ goto failure;
if (setint(d, "SEARCH_ERROR", SEARCH_ERROR) < 0) goto failure;
if (setint(d, "PY_SOURCE", PY_SOURCE) < 0) goto failure;
More information about the Python-checkins
mailing list