Skip to content

bpo-43588: fix _warnings.c static variables under building under building Python with --with-experimental-isolated-subinterpreters may cause crash #24971

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

Closed
dexterhahaha wants to merge 1 commit into from
Closed

bpo-43588: fix _warnings.c static variables under building under building Python with --with-experimental-isolated-subinterpreters may cause crash #24971

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 _warnings.c static variables under building under building Python… 
… with --with-experimental-isolated-subinterpreters may cause crash
  • Loading branch information
xiejunyi committed Mar 22, 2021
commit 894a26950dbe6d2115b913c4bb1e9c76f5d9fd11
37 changes: 17 additions & 20 deletions Python/_warnings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,55 +757,52 @@ warn_explicit(PyObject *category, PyObject *message,
static int
is_internal_frame(PyFrameObject *frame)
{
static PyObject *importlib_string = NULL;
static PyObject *bootstrap_string = NULL;
int contains;
int ret = 0;

PyObject *importlib_string = PyUnicode_FromString("importlib");
if (importlib_string == NULL) {
importlib_string = PyUnicode_FromString("importlib");
if (importlib_string == NULL) {
return 0;
}
goto err;
}

bootstrap_string = PyUnicode_FromString("_bootstrap");
if (bootstrap_string == NULL) {
Py_DECREF(importlib_string);
return 0;
}
Py_INCREF(importlib_string);
Py_INCREF(bootstrap_string);
PyObject *bootstrap_string = PyUnicode_FromString("_bootstrap");
if (bootstrap_string == NULL) {
goto err;
}

if (frame == NULL) {
return 0;
goto err;
}

PyCodeObject *code = PyFrame_GetCode(frame);
PyObject *filename = code->co_filename;
Py_DECREF(code);

if (filename == NULL) {
return 0;
goto err;
}
if (!PyUnicode_Check(filename)) {
return 0;
goto err;
}

contains = PyUnicode_Contains(filename, importlib_string);
if (contains < 0) {
return 0;
goto err;
}
else if (contains > 0) {
contains = PyUnicode_Contains(filename, bootstrap_string);
if (contains < 0) {
return 0;
goto err;
}
else if (contains > 0) {
return 1;
ret = 1;
}
}

return 0;
err:
Py_XDECREF(importlib_string);
Py_XDECREF(bootstrap_string);
return ret;
}

static PyFrameObject *
Expand Down