[3.13] gh-132769: Refactor possible read-out-of-bounds in lexer.c (GH-132770) (#132788)

miss-islington · sobolevn · web-flow · commit e140e6ef789b · 2025-04-21T22:42:55.000Z
gh-132769: Refactor possible read-out-of-bounds in `lexer.c` (GH-132770) (cherry picked from commit ea8ec95) Co-authored-by: sobolevn <mail@sobolevn.me>
diff --git a/Parser/lexer/lexer.c b/Parser/lexer/lexer.c
@@ -140,7 +140,7 @@ set_fstring_expr(struct tok_state* tok, struct token *token, char c) {
         for (i = 0, j = 0; i < input_length; i++) {
             if (tok_mode->last_expr_buffer[i] == '#') {
                 // Skip characters until newline or end of string
-                while (tok_mode->last_expr_buffer[i] != '\0' && i < input_length) {
+                while (i < input_length && tok_mode->last_expr_buffer[i] != '\0') {
                     if (tok_mode->last_expr_buffer[i] == '\n') {
                         result[j++] = tok_mode->last_expr_buffer[i];
                         break;
