mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
[3.13] gh-127208: Reject null character in _imp.create_dynamic() (GH-127400) (#127418)
gh-127208: Reject null character in _imp.create_dynamic() (GH-127400)
_imp.create_dynamic() now rejects embedded null characters in the
path and in the module name.
(cherry picked from commit b14fdadc6c
)
Co-authored-by: Victor Stinner <vstinner@python.org>
This commit is contained in:
parent
6a0663404b
commit
c4a359dc42
2 changed files with 18 additions and 3 deletions
|
@ -1152,6 +1152,19 @@ except ImportError as e:
|
||||||
stdout, stderr = popen.communicate()
|
stdout, stderr = popen.communicate()
|
||||||
self.assertRegex(stdout, expected_error)
|
self.assertRegex(stdout, expected_error)
|
||||||
|
|
||||||
|
def test_create_dynamic_null(self):
|
||||||
|
with self.assertRaisesRegex(ValueError, 'embedded null character'):
|
||||||
|
class Spec:
|
||||||
|
name = "a\x00b"
|
||||||
|
origin = "abc"
|
||||||
|
_imp.create_dynamic(Spec())
|
||||||
|
|
||||||
|
with self.assertRaisesRegex(ValueError, 'embedded null character'):
|
||||||
|
class Spec2:
|
||||||
|
name = "abc"
|
||||||
|
origin = "a\x00b"
|
||||||
|
_imp.create_dynamic(Spec2())
|
||||||
|
|
||||||
|
|
||||||
@skip_if_dont_write_bytecode
|
@skip_if_dont_write_bytecode
|
||||||
class FilePermissionTests(unittest.TestCase):
|
class FilePermissionTests(unittest.TestCase):
|
||||||
|
|
|
@ -1155,12 +1155,14 @@ del_extensions_cache_value(struct extensions_cache_value *value)
|
||||||
static void *
|
static void *
|
||||||
hashtable_key_from_2_strings(PyObject *str1, PyObject *str2, const char sep)
|
hashtable_key_from_2_strings(PyObject *str1, PyObject *str2, const char sep)
|
||||||
{
|
{
|
||||||
Py_ssize_t str1_len, str2_len;
|
const char *str1_data = _PyUnicode_AsUTF8NoNUL(str1);
|
||||||
const char *str1_data = PyUnicode_AsUTF8AndSize(str1, &str1_len);
|
const char *str2_data = _PyUnicode_AsUTF8NoNUL(str2);
|
||||||
const char *str2_data = PyUnicode_AsUTF8AndSize(str2, &str2_len);
|
|
||||||
if (str1_data == NULL || str2_data == NULL) {
|
if (str1_data == NULL || str2_data == NULL) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
Py_ssize_t str1_len = strlen(str1_data);
|
||||||
|
Py_ssize_t str2_len = strlen(str2_data);
|
||||||
|
|
||||||
/* Make sure sep and the NULL byte won't cause an overflow. */
|
/* Make sure sep and the NULL byte won't cause an overflow. */
|
||||||
assert(SIZE_MAX - str1_len - str2_len > 2);
|
assert(SIZE_MAX - str1_len - str2_len > 2);
|
||||||
size_t size = str1_len + 1 + str2_len + 1;
|
size_t size = str1_len + 1 + str2_len + 1;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue