summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Galindo Salgado <Pablogsal@gmail.com>2022-03-26 18:26:05 (GMT)
committerGitHub <noreply@github.com>2022-03-26 18:26:05 (GMT)
commit27ee43183437c473725eba00def0ea7647688926 (patch)
tree3606c5cfd8e3420cf13b0b3c5f6374e5a2b5513f
parent48b3ae9e29545891bece874b4c0c0e394fe0f048 (diff)
downloadcpython-27ee43183437c473725eba00def0ea7647688926.zip
cpython-27ee43183437c473725eba00def0ea7647688926.tar.gz
cpython-27ee43183437c473725eba00def0ea7647688926.tar.bz2
[3.10] bpo-47117: Don't crash if we fail to decode characters when the tokenizer buffers are uninitialized (GH-32129) (GH-32130)
Automerge-Triggered-By: GH:pablogsal. (cherry picked from commit 26cca8067bf5306e372c0e90036d832c5021fd90) Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2022-03-26-15-45-57.bpo-47117.60W6GQ.rst2
-rw-r--r--Parser/pegen.c9
2 files changed, 9 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-26-15-45-57.bpo-47117.60W6GQ.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-26-15-45-57.bpo-47117.60W6GQ.rst
new file mode 100644
index 0000000..5098ed8
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-03-26-15-45-57.bpo-47117.60W6GQ.rst
@@ -0,0 +1,2 @@
+Fix a crash if we fail to decode characters in interactive mode if the
+tokenizer buffers are uninitialized. Patch by Pablo Galindo.
diff --git a/Parser/pegen.c b/Parser/pegen.c
index df17476..90a6ab9 100644
--- a/Parser/pegen.c
+++ b/Parser/pegen.c
@@ -435,7 +435,12 @@ get_error_line(Parser *p, Py_ssize_t lineno)
assert((p->tok->fp == NULL && p->tok->str != NULL) || p->tok->fp == stdin);
char *cur_line = p->tok->fp_interactive ? p->tok->interactive_src_start : p->tok->str;
- assert(cur_line != NULL);
+ if (cur_line == NULL) {
+ assert(p->tok->fp_interactive);
+ // We can reach this point if the tokenizer buffers for interactive source have not been
+ // initialized because we failed to decode the original source with the given locale.
+ return PyUnicode_FromStringAndSize("", 0);
+ }
const char* buf_end = p->tok->fp_interactive ? p->tok->interactive_src_end : p->tok->inp;
Py_ssize_t relative_lineno = p->starting_lineno ? lineno - p->starting_lineno + 1 : lineno;
@@ -495,7 +500,7 @@ _PyPegen_raise_error_known_location(Parser *p, PyObject *errtype,
goto error;
}
- if (p->tok->fp_interactive) {
+ if (p->tok->fp_interactive && p->tok->interactive_src_start != NULL) {
error_line = get_error_line(p, lineno);
}
else if (p->start_rule == Py_file_input) {