Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-43588: fix exceptions.c use static variable under building Python with --with-experimental-isolated-subinterpreters may cause crash. #24965

Closed
wants to merge 1 commit into from
Closed

bpo-43588: fix exceptions.c use static variable under building Python with --with-experimental-isolated-subinterpreters may cause crash. #24965

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix exceptions static variables under building Python with --with-exp… 
…erimental-isolated-subinterpreters cause crash
  • Loading branch information
xiejunyi committed Mar 22, 2021
commit 19c84f9193ad37e9d53397179967ec7335e08053
19 changes: 9 additions & 10 deletions Objects/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2984,13 +2984,14 @@ _set_legacy_print_statement_msg(PySyntaxErrorObject *self, Py_ssize_t start)
static int
_check_for_legacy_statements(PySyntaxErrorObject *self, Py_ssize_t start)
{
_Py_static_string(_print_prefix, "print ");
_Py_static_string(_exec_prefix, "exec ");

/* Return values:
* -1: an error occurred
* 0: nothing happened
* 1: the check triggered & the error message was changed
*/
static PyObject *print_prefix = NULL;
static PyObject *exec_prefix = NULL;
Py_ssize_t text_len = PyUnicode_GET_LENGTH(self->text), match;
int kind = PyUnicode_KIND(self->text);
const void *data = PyUnicode_DATA(self->text);
Expand All @@ -3008,12 +3009,11 @@ _check_for_legacy_statements(PySyntaxErrorObject *self, Py_ssize_t start)
}

/* Check for legacy print statements */
PyObject *print_prefix = _PyUnicode_FromId(&_print_prefix); // borrowed ref
if (print_prefix == NULL) {
print_prefix = PyUnicode_InternFromString("print ");
if (print_prefix == NULL) {
return -1;
}
return -1;
}

match = PyUnicode_Tailmatch(self->text, print_prefix,
start, text_len, -1);
if (match == -1) {
Expand All @@ -3024,12 +3024,11 @@ _check_for_legacy_statements(PySyntaxErrorObject *self, Py_ssize_t start)
}

/* Check for legacy exec statements */
PyObject *exec_prefix = _PyUnicode_FromId(&_exec_prefix); // borrowed ref
if (exec_prefix == NULL) {
exec_prefix = PyUnicode_InternFromString("exec ");
if (exec_prefix == NULL) {
return -1;
}
return -1;
}

match = PyUnicode_Tailmatch(self->text, exec_prefix, start, text_len, -1);
if (match == -1) {
return -1;
Expand Down