Issue #19437: Fix PyImport_ImportModuleLevelObject(), handle

vstinner · vstinner · commit 22af2599a9f5 · 2013-11-13T12:11:36.000+01:00
PyUnicode_Substring() failure (ex: MemoryError)
diff --git a/Python/import.c b/Python/import.c
@@ -1364,7 +1364,11 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
                 goto error;
             }
         }
+
         base = PyUnicode_Substring(package, 0, last_dot);
+        if (base == NULL)
+            goto error;
+
         if (PyUnicode_GET_LENGTH(name) > 0) {
             PyObject *borrowed_dot, *seq = NULL;
 

Original file line number	Diff line number	Diff line change
`@@ -1364,7 +1364,11 @@ PyImport_ImportModuleLevelObject(PyObject name, PyObject given_globals,`
`1364`	`1364`	`goto error;`
`1365`	`1365`	`}`
`1366`	`1366`	`}`
	`1367`	`+`
`1367`	`1368`	`base = PyUnicode_Substring(package, 0, last_dot);`
	`1369`	`+ if (base == NULL)`
	`1370`	`+ goto error;`
	`1371`	`+`
`1368`	`1372`	`if (PyUnicode_GET_LENGTH(name) > 0) {`
`1369`	`1373`	`PyObject borrowed_dot, seq = NULL;`
`1370`	`1374`