mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-13 10:23:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-127165: Disallow embedded NULL characters in _interpreters (#127199)

Browse source
This commit is contained in:
Peter Bierma 2024-12-01 01:33:23 -05:00 • committed by GitHub
parent 328187cc4f
commit 46bfd26fb2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_interpreters/test_api.py
View file

@ -1649,6 +1649,10 @@ class LowLevelTests(TestBase):
self.assertIs(after2, None) self.assertIs(after2, None)
self.assertEqual(after3.type.__name__, 'AssertionError') self.assertEqual(after3.type.__name__, 'AssertionError')
with self.assertRaises(ValueError):
# GH-127165: Embedded NULL characters broke the lookup
_interpreters.set___main___attrs(interpid, {"\x00": 1})
with self.subTest('from C-API'): with self.subTest('from C-API'):
with self.interpreter_from_capi() as interpid: with self.interpreter_from_capi() as interpid:
with self.assertRaisesRegex(InterpreterError, 'unrecognized'): with self.assertRaisesRegex(InterpreterError, 'unrecognized'):

5
Python/crossinterp.c
View file

@ -342,6 +342,11 @@ _copy_string_obj_raw(PyObject *strobj, Py_ssize_t *p_size)
return NULL; return NULL;
} }
if (size != (Py_ssize_t)strlen(str)) {
PyErr_SetString(PyExc_ValueError, "found embedded NULL character");
return NULL;
}
char *copied = PyMem_RawMalloc(size+1); char *copied = PyMem_RawMalloc(size+1);
if (copied == NULL) { if (copied == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();