Skip to content

Commit

Permalink
pythongh-127563: use dk_log2_index_bytes=3 in empty dicts (pythonGH…
Browse files Browse the repository at this point in the history
…-127568)

This fixes a UBSan failure (unaligned zero-size memcpy) in `dictobject.c`.
  • Loading branch information
picnixz authored Dec 10, 2024
1 parent cef0a90 commit 9af96f4
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Objects/dictobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -588,11 +588,14 @@ estimate_log2_keysize(Py_ssize_t n)

/* This immutable, empty PyDictKeysObject is used for PyDict_Clear()
* (which cannot fail and thus can do no allocation).
*
* See https://github.com/python/cpython/pull/127568#discussion_r1868070614
* for the rationale of using dk_log2_index_bytes=3 instead of 0.
*/
static PyDictKeysObject empty_keys_struct = {
_Py_DICT_IMMORTAL_INITIAL_REFCNT, /* dk_refcnt */
0, /* dk_log2_size */
0, /* dk_log2_index_bytes */
3, /* dk_log2_index_bytes */
DICT_KEYS_UNICODE, /* dk_kind */
#ifdef Py_GIL_DISABLED
{0}, /* dk_mutex */
Expand Down

0 comments on commit 9af96f4

Please sign in to comment.