fix UBSan failure in dictobject.c

picnixz · picnixz · commit 4f616fe140e3 · 2024-12-03T16:50:51.000+01:00
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -2012,7 +2012,7 @@ dictresize(PyInterpreterState *interp, PyDictObject *mp,
             if (unicode) { // combined unicode -> combined unicode
                 PyDictUnicodeEntry *newentries = DK_UNICODE_ENTRIES(newkeys);
                 if (oldkeys->dk_nentries == numentries && mp->ma_keys->dk_kind == DICT_KEYS_UNICODE) {
-                    memcpy(newentries, oldentries, numentries * sizeof(PyDictUnicodeEntry));
+                    memcpy(newentries, (const void *)oldentries, numentries * sizeof(PyDictUnicodeEntry));
                 }
                 else {
                     PyDictUnicodeEntry *ep = oldentries;

Original file line number	Diff line number	Diff line change
`@@ -2012,7 +2012,7 @@ dictresize(PyInterpreterState interp, PyDictObject mp,`
`2012`	`2012`	`if (unicode) { // combined unicode -> combined unicode`
`2013`	`2013`	`PyDictUnicodeEntry *newentries = DK_UNICODE_ENTRIES(newkeys);`
`2014`	`2014`	`if (oldkeys->dk_nentries == numentries && mp->ma_keys->dk_kind == DICT_KEYS_UNICODE) {`
`2015`		`- memcpy(newentries, oldentries, numentries * sizeof(PyDictUnicodeEntry));`
	`2015`	`+ memcpy(newentries, (const void )oldentries, numentries sizeof(PyDictUnicodeEntry));`
`2016`	`2016`	`}`
`2017`	`2017`	`else {`
`2018`	`2018`	`PyDictUnicodeEntry *ep = oldentries;`