]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-127563: use `dk_log2_index_bytes=3` in empty dicts (GH-127568) (GH-127813)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Thu, 12 Dec 2024 11:50:51 +0000 (12:50 +0100)
committerGitHub <noreply@github.com>
Thu, 12 Dec 2024 11:50:51 +0000 (12:50 +0100)
This fixes a UBSan failure (unaligned zero-size memcpy) in `dictobject.c`.
(cherry picked from commit 9af96f440618304e7cc609c246e1f8c8b2d7a119)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
Objects/dictobject.c

index 4e965314945aca4735b8b20f4184ddc51d9a39e6..7337e290e89c1027d286d493500c8016c726037b 100644 (file)
@@ -458,11 +458,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_IMMORTAL_REFCNT, /* dk_refcnt */
         0, /* dk_log2_size */
-        0, /* dk_log2_index_bytes */
+        3, /* dk_log2_index_bytes */
         DICT_KEYS_UNICODE, /* dk_kind */
         1, /* dk_version */
         0, /* dk_usable (immutable) */