https://github.com/python/cpython/commit/36c6178d372b075e9c74b786cfb5e47702976b1c
commit: 36c6178d372b075e9c74b786cfb5e47702976b1c
branch: main
author: Bénédikt Tran <[email protected]>
committer: colesbury <[email protected]>
date: 2024-12-06T09:31:30-05:00
summary:
gh-126024: fix UBSan failure in `unicodeobject.c:find_first_nonascii`
(GH-127566)
files:
M Objects/unicodeobject.c
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 463da06445984b..33c4747bbef488 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -5083,12 +5083,9 @@ find_first_nonascii(const unsigned char *start, const
unsigned char *end)
const unsigned char *p2 = _Py_ALIGN_UP(p, SIZEOF_SIZE_T);
#if PY_LITTLE_ENDIAN && HAVE_CTZ
if (p < p2) {
-#if defined(_M_AMD64) || defined(_M_IX86) || defined(__x86_64__) ||
defined(__i386__)
- // x86 and amd64 are little endian and can load unaligned memory.
- size_t u = *(const size_t*)p & ASCII_CHAR_MASK;
-#else
- size_t u = load_unaligned(p, p2 - p) & ASCII_CHAR_MASK;
-#endif
+ size_t u;
+ memcpy(&u, p, sizeof(size_t));
+ u &= ASCII_CHAR_MASK;
if (u) {
return (ctz(u) - 7) / 8;
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
