Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-121165: protect macro expansion of `ADJUST_INDICES` with do-while(0) (#121166)

This commit is contained in:
Bénédikt Tran 2024-07-02 12:57:51 +02:00 committed by GitHub
parent 15232a0819
commit 6343486eb6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Objects/bytes_methods.c
View File

@ -432,19 +432,24 @@ parse_args_finds_byte(const char *function_name, PyObject **subobj, char *byte)
} }
/* helper macro to fixup start/end slice values */ /* helper macro to fixup start/end slice values */
#define ADJUST_INDICES(start, end, len) \ #define ADJUST_INDICES(start, end, len) \
if (end > len) \ do { \
end = len; \ if (end > len) { \
else if (end < 0) { \ end = len; \
end += len; \ } \
if (end < 0) \ else if (end < 0) { \
end = 0; \ end += len; \
} \ if (end < 0) { \
if (start < 0) { \ end = 0; \
start += len; \ } \
if (start < 0) \ } \
start = 0; \ if (start < 0) { \
} start += len; \
if (start < 0) { \
start = 0; \
} \
} \
} while (0)
Py_LOCAL_INLINE(Py_ssize_t) Py_LOCAL_INLINE(Py_ssize_t)
find_internal(const char *str, Py_ssize_t len, find_internal(const char *str, Py_ssize_t len,

31
Objects/unicodeobject.c
View File

@ -9315,19 +9315,24 @@ _PyUnicode_TransformDecimalAndSpaceToASCII(PyObject *unicode)
/* --- Helpers ------------------------------------------------------------ */ /* --- Helpers ------------------------------------------------------------ */
/* helper macro to fixup start/end slice values */ /* helper macro to fixup start/end slice values */
#define ADJUST_INDICES(start, end, len) \ #define ADJUST_INDICES(start, end, len) \
if (end > len) \ do { \
end = len; \ if (end > len) { \
else if (end < 0) { \ end = len; \
end += len; \ } \
if (end < 0) \ else if (end < 0) { \
end = 0; \ end += len; \
} \ if (end < 0) { \
if (start < 0) { \ end = 0; \
start += len; \ } \
if (start < 0) \ } \
start = 0; \ if (start < 0) { \
} start += len; \
if (start < 0) { \
start = 0; \
} \
} \
} while (0)
static Py_ssize_t static Py_ssize_t
any_find_slice(PyObject* s1, PyObject* s2, any_find_slice(PyObject* s1, PyObject* s2,