Skip to content

Commit 9974e1b

Browse files
orenmnserhiy-storchaka
authored andcommitted
bpo-31315: Fix an assertion failure in imp.create_dynamic(), when spec.name is not a string. (#3257)
1 parent 6db7033 commit 9974e1b

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

Lib/test/test_imp.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,17 @@ def test_load_source(self):
313313
with self.assertRaisesRegex(ValueError, 'embedded null'):
314314
imp.load_source(__name__, __file__ + "\0")
315315

316+
@support.cpython_only
317+
def test_issue31315(self):
318+
# There shouldn't be an assertion failure in imp.create_dynamic(),
319+
# when spec.name is not a string.
320+
create_dynamic = support.get_attribute(imp, 'create_dynamic')
321+
class BadSpec:
322+
name = None
323+
origin = 'foo'
324+
with self.assertRaises(TypeError):
325+
create_dynamic(BadSpec())
326+
316327

317328
class ReloadTests(unittest.TestCase):
318329

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix an assertion failure in imp.create_dynamic(), when spec.name is not a
2+
string. Patch by Oren Milman.

Python/importdl.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ _PyImport_LoadDynamicModuleWithSpec(PyObject *spec, FILE *fp)
103103
if (name_unicode == NULL) {
104104
return NULL;
105105
}
106+
if (!PyUnicode_Check(name_unicode)) {
107+
PyErr_SetString(PyExc_TypeError,
108+
"spec.name must be a string");
109+
goto error;
110+
}
106111

107112
name = get_encoded_name(name_unicode, &hook_prefix);
108113
if (name == NULL) {

0 commit comments

Comments
 (0)