From: Pablo Galindo Salgado <Pablogsal@gmail.com>
Date: Tue, 16 Nov 2021 19:51:52 +0000 (+0000)
Subject: bpo-45820: Fix a segfault when the parser fails without reading any input (GH-29580)
X-Git-Tag: v3.11.0a3~235
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df4ae55e66e34ea8de6a34f0b104871ddaf35d53;p=thirdparty%2FPython%2Fcpython.git

bpo-45820: Fix a segfault when the parser fails without reading any input (GH-29580)
---

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-11-16-19-00-27.bpo-45820.2X6Psr.rst b/Misc/NEWS.d/next/Core and Builtins/2021-11-16-19-00-27.bpo-45820.2X6Psr.rst
new file mode 100644
index 000000000000..c2ec3d690cd4
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-11-16-19-00-27.bpo-45820.2X6Psr.rst	
@@ -0,0 +1,2 @@
+Fix a segfault when the parser fails without reading any input. Patch by
+Pablo Galindo
diff --git a/Parser/pegen.c b/Parser/pegen.c
index 8a3f740c359c..2931a4056086 100644
--- a/Parser/pegen.c
+++ b/Parser/pegen.c
@@ -368,6 +368,14 @@ tokenizer_error(Parser *p)
 void *
 _PyPegen_raise_error(Parser *p, PyObject *errtype, const char *errmsg, ...)
 {
+    if (p->fill == 0) {
+        va_list va;
+        va_start(va, errmsg);
+        _PyPegen_raise_error_known_location(p, errtype, 0, 0, 0, -1, errmsg, va);
+        va_end(va);
+        return NULL;
+    }
+
     Token *t = p->known_err_token != NULL ? p->known_err_token : p->tokens[p->fill - 1];
     Py_ssize_t col_offset;
     Py_ssize_t end_col_offset = -1;