Fix the caret position in some syntax errors in interactive mode (pythonGH-30718)

pablogsal · web-flow · commit 650720a0cfa1 · 2022-01-20T15:34:13.000Z
diff --git a/Parser/pegen_errors.c b/Parser/pegen_errors.c
@@ -251,14 +251,15 @@ get_error_line_from_tokenizer_buffers(Parser *p, Py_ssize_t lineno)
     assert(cur_line != NULL);
 
     Py_ssize_t relative_lineno = p->starting_lineno ? lineno - p->starting_lineno + 1 : lineno;
+    const char* buf_end = p->tok->fp_interactive ? p->tok->interactive_src_end : p->tok->inp;
 
     for (int i = 0; i < relative_lineno - 1; i++) {
         char *new_line = strchr(cur_line, '\n') + 1;
         // The assert is here for debug builds but the conditional that
         // follows is there so in release builds we do not crash at the cost
         // to report a potentially wrong line.
-        assert(new_line != NULL && new_line < p->tok->inp);
-        if (new_line == NULL || new_line >= p->tok->inp) {
+        assert(new_line != NULL && new_line <= buf_end);
+        if (new_line == NULL || new_line > buf_end) {
             break;
         }
         cur_line = new_line;
