gh-112388: Fix an error that was causing the parser to try to overwrite tokenizer...

Signed-off-by: Pablo Galindo <pablogsal@gmail.com>

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index f6fa6495508d2c41db387444a6e0c6ed09c7c5ca..e80e95383b897d2fca8f7d9c889700f45f127cbd 100644 (file)
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -2349,6 +2349,7 @@ func(
 
     def test_invisible_characters(self):
         self._check_error('print\x17("Hello")', "invalid non-printable character")
+        self._check_error(b"with(0,,):\n\x01", "invalid non-printable character")
 
     def test_match_call_does_not_raise_syntax_error(self):
         code = """

diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-25-22-58-49.gh-issue-112388.MU3cIM.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-25-22-58-49.gh-issue-112388.MU3cIM.rst
new file mode 100644 (file)
index 0000000..1c82be2
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-11-25-22-58-49.gh-issue-112388.MU3cIM.rst
@@ -0,0 +1,2 @@
+Fix an error that was causing the parser to try to overwrite tokenizer
+errors. Patch by pablo Galindo

diff --git a/Parser/pegen_errors.c b/Parser/pegen_errors.c
index e2bc3b91c80718856657ab1539e1228f1da748c4..2528d4502b3c0c7a7e74ba4eab8e9853ea06b7ee 100644 (file)
--- a/Parser/pegen_errors.c
+++ b/Parser/pegen_errors.c
@@ -219,6 +219,10 @@ exit:
 void *
 _PyPegen_raise_error(Parser *p, PyObject *errtype, int use_mark, const char *errmsg, ...)
 {
+    // Bail out if we already have an error set.
+    if (p->error_indicator && PyErr_Occurred()) {
+        return NULL;
+    }
     if (p->fill == 0) {
         va_list va;
         va_start(va, errmsg);