[Python-checkins] r52161 - python/branches/release24-maint/Python/import.c

Thu Oct 5 19:19:31 CEST 2006

Author: andrew.kuchling
Date: Thu Oct 5 19:19:30 2006
New Revision: 52161
Modified:
 python/branches/release24-maint/Python/import.c
Log:
[Backport r51247 | neal.norwitz]
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/branches/release24-maint/Python/import.c
==============================================================================

--- python/branches/release24-maint/Python/import.c	(original)
+++ python/branches/release24-maint/Python/import.c	Thu Oct 5 19:19:30 2006
@@ -904,7 +904,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);
@@ -1194,6 +1195,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),
@@ -2827,6 +2830,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;
