From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 13 Nov 2013 11:11:36 +0000 (+0100)
Subject: Issue #19437: Fix PyImport_ImportModuleLevelObject(), handle
X-Git-Tag: v3.4.0b1~297
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22af2599a9f5724664aefb7146427cb4de4d65d3;p=thirdparty%2FPython%2Fcpython.git

Issue #19437: Fix PyImport_ImportModuleLevelObject(), handle
PyUnicode_Substring() failure (ex: MemoryError)
---

diff --git a/Python/import.c b/Python/import.c
index c96106f37326..ad181a2942a3 100644
--- 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;