https://github.com/python/cpython/commit/6343486eb60ac5a9e15402a592298259c5afdee1
commit: 6343486eb60ac5a9e15402a592298259c5afdee1
branch: main
author: Bénédikt Tran <[email protected]>
committer: kumaraditya303 <[email protected]>
date: 2024-07-02T16:27:51+05:30
summary:
gh-121165: protect macro expansion of `ADJUST_INDICES` with do-while(0)
(#121166)
files:
M Objects/bytes_methods.c
M Objects/unicodeobject.c
diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c
index 55252406578774..c239ae18a593e3 100644
--- a/Objects/bytes_methods.c
+++ b/Objects/bytes_methods.c
@@ -432,19 +432,24 @@ parse_args_finds_byte(const char *function_name, PyObject
**subobj, char *byte)
}
/* helper macro to fixup start/end slice values */
-#define ADJUST_INDICES(start, end, len) \
- if (end > len) \
- end = len; \
- else if (end < 0) { \
- end += len; \
- if (end < 0) \
- end = 0; \
- } \
- if (start < 0) { \
- start += len; \
- if (start < 0) \
- start = 0; \
- }
+#define ADJUST_INDICES(start, end, len) \
+ do { \
+ if (end > len) { \
+ end = len; \
+ } \
+ else if (end < 0) { \
+ end += len; \
+ if (end < 0) { \
+ end = 0; \
+ } \
+ } \
+ if (start < 0) { \
+ start += len; \
+ if (start < 0) { \
+ start = 0; \
+ } \
+ } \
+ } while (0)
Py_LOCAL_INLINE(Py_ssize_t)
find_internal(const char *str, Py_ssize_t len,
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 9738442ab962b0..394ea888fc9231 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9315,19 +9315,24 @@ _PyUnicode_TransformDecimalAndSpaceToASCII(PyObject
*unicode)
/* --- Helpers ------------------------------------------------------------ */
/* helper macro to fixup start/end slice values */
-#define ADJUST_INDICES(start, end, len) \
- if (end > len) \
- end = len; \
- else if (end < 0) { \
- end += len; \
- if (end < 0) \
- end = 0; \
- } \
- if (start < 0) { \
- start += len; \
- if (start < 0) \
- start = 0; \
- }
+#define ADJUST_INDICES(start, end, len) \
+ do { \
+ if (end > len) { \
+ end = len; \
+ } \
+ else if (end < 0) { \
+ end += len; \
+ if (end < 0) { \
+ end = 0; \
+ } \
+ } \
+ if (start < 0) { \
+ start += len; \
+ if (start < 0) { \
+ start = 0; \
+ } \
+ } \
+ } while (0)
static Py_ssize_t
any_find_slice(PyObject* s1, PyObject* s2,
_______________________________________________
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]
