From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 2 Jan 2024 13:22:39 +0000 (+0100)
Subject: [3.11] gh-113602: Bail out when the parser tries to override existing errors (GH... 
X-Git-Tag: v3.11.8~197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c381ec4edfa6364474fa795a93ed1cccb6df903;p=thirdparty%2FPython%2Fcpython.git

[3.11] gh-113602: Bail out when the parser tries to override existing errors (GH-113607) (#113653)

gh-113602: Bail out when the parser tries to override existing errors (GH-113607)
(cherry picked from commit 9ed36d533ab8b256f0a589b5be6d7a2fdcf4aff2)

Signed-off-by: Pablo Galindo <pablogsal@gmail.com>
Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
---

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 050d084a97ae..9dd0f745cf2c 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -2143,6 +2143,8 @@ func(
 """
         self._check_error(code, "parenthesis '\\)' does not match opening parenthesis '\\['")
 
+        self._check_error("match y:\n case e(e=v,v,", " was never closed")
+
         # Examples with dencodings
         s = b'# coding=latin\n(aaaaaaaaaaaaaaaaa\naaaaaaaaaaa\xb5'
         self._check_error(s, r"'\(' was never closed")
diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-01-01-00-07-02.gh-issue-113602.cWuTzk.rst b/Misc/NEWS.d/next/Core and Builtins/2024-01-01-00-07-02.gh-issue-113602.cWuTzk.rst
new file mode 100644
index 000000000000..5e0646573487
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2024-01-01-00-07-02.gh-issue-113602.cWuTzk.rst	
@@ -0,0 +1,2 @@
+Fix an error that was causing the parser to try to overwrite existing errors
+and crashing in the process. Patch by Pablo Galindo
diff --git a/Parser/pegen_errors.c b/Parser/pegen_errors.c
index fb9fa2909717..ccb0d3740618 100644
--- a/Parser/pegen_errors.c
+++ b/Parser/pegen_errors.c
@@ -299,6 +299,10 @@ _PyPegen_raise_error_known_location(Parser *p, PyObject *errtype,
                                     Py_ssize_t end_lineno, Py_ssize_t end_col_offset,
                                     const char *errmsg, va_list va)
 {
+    // Bail out if we already have an error set.
+    if (p->error_indicator && PyErr_Occurred()) {
+        return NULL;
+    }
     PyObject *value = NULL;
     PyObject *errstr = NULL;
     PyObject *error_line = NULL;