mirror of
https://github.com/python/cpython.git
synced 2025-08-10 11:58:39 +00:00
[3.12] gh-113602: Bail out when the parser tries to override existing errors (GH-113607) (#113652)
gh-113602: Bail out when the parser tries to override existing errors (GH-113607)
(cherry picked from commit 9ed36d533a
)
Signed-off-by: Pablo Galindo <pablogsal@gmail.com>
Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
This commit is contained in:
parent
20631e840e
commit
499f1d0a03
3 changed files with 8 additions and 0 deletions
|
@ -2322,6 +2322,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")
|
||||
|
|
|
@ -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
|
|
@ -309,6 +309,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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue