Skip to content

gh-127563: fix UBSan failure in dictobject.c #127568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 10, 2024
Merged

gh-127563: fix UBSan failure in dictobject.c #127568

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f616fe
fix UBSan failure in `dictobject.c`
picnixz Dec 3, 2024
f164f24
use `dk_log2_index_bytes=3` in empty dicts
picnixz Dec 6, 2024
24b3f98
remove un-necessary cast
picnixz Dec 6, 2024
91defd4
Merge branch 'main' into fix/ubsan/dict/misaligned-loads-127563
picnixz Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Objects/dictobject.c
View file
Open in desktop
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
Loading