From 0ed43f59d987aeeb3534aa8cef0458406295d48a Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Tue, 2 Jan 2024 13:00:52 +0000 Subject: [PATCH] gh-113602: Bail out when the parser tries to override existing errors (#113607) Signed-off-by: Pablo Galindo --- Lib/test/test_syntax.py | 2 ++ .../2024-01-01-00-07-02.gh-issue-113602.cWuTzk.rst | 2 ++ Parser/pegen_errors.c | 4 ++++ 3 files changed, 8 insertions(+) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2024-01-01-00-07-02.gh-issue-113602.cWuTzk.rst diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 8b3ca69c9fe1550..83cbf5ec865dbbe 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -2360,6 +2360,8 @@ def test_error_parenthesis(self): """ 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 000000000000000..5e064657348720e --- /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 8a02aab1f4e504c..e15673d02dd3b05 100644 --- a/Parser/pegen_errors.c +++ b/Parser/pegen_errors.c @@ -311,6 +311,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;