From 53612c44f4a57a66424723a8346b5beb55541b89 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Tue, 16 Nov 2021 19:51:52 +0000 Subject: [PATCH 1/2] bpo-45820: Fix a segfault when the parser fails without reading any input (GH-29580) (cherry picked from commit df4ae55e66e34ea8de6a34f0b104871ddaf35d53) Co-authored-by: Pablo Galindo Salgado --- .../2021-11-16-19-00-27.bpo-45820.2X6Psr.rst | 2 ++ Parser/pegen/pegen.c | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2021-11-16-19-00-27.bpo-45820.2X6Psr.rst 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 00000000000000..c2ec3d690cd4bc --- /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/pegen.c b/Parser/pegen/pegen.c index efcf9ac1ebd742..c2f3eaf8c78571 100644 --- a/Parser/pegen/pegen.c +++ b/Parser/pegen/pegen.c @@ -364,6 +364,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; if (t->col_offset == -1) { From cf49e33aa32b363af6004dc8d29e017f252d99ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Langa?= Date: Thu, 18 Nov 2021 00:55:24 +0100 Subject: [PATCH 2/2] regen-pegen --- .gitignore | 2 ++ Parser/pegen/pegen.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 864152451dd9d0..0dd3aee5c3151d 100644 --- a/.gitignore +++ b/.gitignore @@ -136,5 +136,7 @@ Tools/ssl/win32 !/Python/ # Artifacts generated by 3.11 lying around when switching branches: +/_bootstrap_python /Programs/_freeze_module +/Python/deepfreeze/ /Python/frozen_modules/ \ No newline at end of file diff --git a/Parser/pegen/pegen.c b/Parser/pegen/pegen.c index c2f3eaf8c78571..aa903f42403ec9 100644 --- a/Parser/pegen/pegen.c +++ b/Parser/pegen/pegen.c @@ -367,7 +367,7 @@ _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); + _PyPegen_raise_error_known_location(p, errtype, 0, 0, errmsg, va); va_end(va); return NULL; }