[3.6] bpo-31315: Fix an assertion failure in imp.create_dynamic(), when spec.name...

(cherry picked from commit 9974e1bcf3d0cec9b38b39b39b7ec8a1ebd9ef54)

diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
index 6f35f49487ce7f979f00d255f022b8dba32cb9af..d513eedc7bb4aa5288d7fc7a625d6c1949b7b176 100644 (file)
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -318,6 +318,17 @@ class ImportTests(unittest.TestCase):
         with self.assertRaisesRegex(ValueError, 'embedded null'):
             imp.load_source(__name__, __file__ + "\0")
 
+    @support.cpython_only
+    def test_issue31315(self):
+        # There shouldn't be an assertion failure in imp.create_dynamic(),
+        # when spec.name is not a string.
+        create_dynamic = support.get_attribute(imp, 'create_dynamic')
+        class BadSpec:
+            name = None
+            origin = 'foo'
+        with self.assertRaises(TypeError):
+            create_dynamic(BadSpec())
+
 
 class ReloadTests(unittest.TestCase):
 

diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-01-00-40-58.bpo-31315.ZX20bl.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-01-00-40-58.bpo-31315.ZX20bl.rst
new file mode 100644 (file)
index 0000000..d13badb
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-01-00-40-58.bpo-31315.ZX20bl.rst
@@ -0,0 +1,2 @@
+Fix an assertion failure in imp.create_dynamic(), when spec.name is not a
+string. Patch by Oren Milman.

diff --git a/Python/importdl.c b/Python/importdl.c
index f56fa94cc427f72077697ef8e479d57f0b8dbe2f..326b26fd06e9eb5e4779938998a0d20ef716cd97 100644 (file)
--- a/Python/importdl.c
+++ b/Python/importdl.c
@@ -103,6 +103,11 @@ _PyImport_LoadDynamicModuleWithSpec(PyObject *spec, FILE *fp)
     if (name_unicode == NULL) {
         return NULL;
     }
+    if (!PyUnicode_Check(name_unicode)) {
+        PyErr_SetString(PyExc_TypeError,
+                        "spec.name must be a string");
+        goto error;
+    }
 
     name = get_encoded_name(name_unicode, &hook_prefix);
     if (name == NULL) {