Skip to content

Commit 7067126

Browse files
dr-carlosvstinner
andauthored
gh-142029: Raise ValueError instead of crashing on empty name given to create_builtin() (#142033)
Co-authored-by: Victor Stinner <[email protected]>
1 parent d716e3b commit 7067126

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

Lib/test/test_import/__init__.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,6 +1253,20 @@ class Spec2:
12531253
origin = "a\x00b"
12541254
_imp.create_dynamic(Spec2())
12551255

1256+
def test_create_builtin(self):
1257+
class Spec:
1258+
name = None
1259+
spec = Spec()
1260+
1261+
with self.assertRaisesRegex(TypeError, 'name must be string, not NoneType'):
1262+
_imp.create_builtin(spec)
1263+
1264+
spec.name = ""
1265+
1266+
# gh-142029
1267+
with self.assertRaisesRegex(ValueError, 'name must not be empty'):
1268+
_imp.create_builtin(spec)
1269+
12561270
def test_filter_syntax_warnings_by_module(self):
12571271
module_re = r'test\.test_import\.data\.syntax_warnings\z'
12581272
unload('test.test_import.data.syntax_warnings')
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Raise :exc:`ValueError` instead of crashing when empty string is used as a name
2+
in ``_imp.create_builtin()``.

Python/import.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4420,6 +4420,12 @@ _imp_create_builtin(PyObject *module, PyObject *spec)
44204420
return NULL;
44214421
}
44224422

4423+
if (PyUnicode_GetLength(name) == 0) {
4424+
PyErr_Format(PyExc_ValueError, "name must not be empty");
4425+
Py_DECREF(name);
4426+
return NULL;
4427+
}
4428+
44234429
PyObject *mod = create_builtin(tstate, name, spec, NULL);
44244430
Py_DECREF(name);
44254431
return mod;

0 commit comments

Comments
 (0)