From a4b48f194a131bad6fe1fcfb1f90ae2029304735 Mon Sep 17 00:00:00 2001 From: Zackery Spytz Date: Fri, 12 Oct 2018 02:20:59 -0600 Subject: [PATCH] bpo-34940: Fix the error handling in _check_for_legacy_statements(). (GH-9764) --- Objects/exceptions.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/Objects/exceptions.c b/Objects/exceptions.c index bb50c1c3696..6aa3d8f8e19 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -2906,7 +2906,7 @@ _check_for_legacy_statements(PySyntaxErrorObject *self, Py_ssize_t start) */ static PyObject *print_prefix = NULL; static PyObject *exec_prefix = NULL; - Py_ssize_t text_len = PyUnicode_GET_LENGTH(self->text); + Py_ssize_t text_len = PyUnicode_GET_LENGTH(self->text), match; int kind = PyUnicode_KIND(self->text); void *data = PyUnicode_DATA(self->text); @@ -2929,9 +2929,12 @@ _check_for_legacy_statements(PySyntaxErrorObject *self, Py_ssize_t start) return -1; } } - if (PyUnicode_Tailmatch(self->text, print_prefix, - start, text_len, -1)) { - + match = PyUnicode_Tailmatch(self->text, print_prefix, + start, text_len, -1); + if (match == -1) { + return -1; + } + if (match) { return _set_legacy_print_statement_msg(self, start); } @@ -2942,10 +2945,17 @@ _check_for_legacy_statements(PySyntaxErrorObject *self, Py_ssize_t start) return -1; } } - if (PyUnicode_Tailmatch(self->text, exec_prefix, - start, text_len, -1)) { - Py_XSETREF(self->msg, - PyUnicode_FromString("Missing parentheses in call to 'exec'")); + match = PyUnicode_Tailmatch(self->text, exec_prefix, start, text_len, -1); + if (match == -1) { + return -1; + } + if (match) { + PyObject *msg = PyUnicode_FromString("Missing parentheses in call " + "to 'exec'"); + if (msg == NULL) { + return -1; + } + Py_XSETREF(self->msg, msg); return 1; } /* Fall back to the default error message */