Skip to content

[3.12] gh-105375: Improve PyErr_WarnExplicit() error handling (GH-105610)#105659

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

Merged
erlend-aasland merged 1 commit into from
Jun 11, 2023
Merged

[3.12] gh-105375: Improve PyErr_WarnExplicit() error handling (GH-105610) #105659

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/C API/2023-06-09-23-34-25.gh-issue-105375.n7amiF.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
Fix a bug in :c:func:`PyErr_WarnExplicit` where an exception could end up
being overwritten if the API failed internally.
28 changes: 16 additions & 12 deletions Python/_warnings.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1301,25 +1301,29 @@ PyErr_WarnExplicit(PyObject *category, const char *text,
const char *module_str, PyObject *registry)
{
PyObject *message = PyUnicode_FromString(text);
if (message == NULL){
return -1;
}
PyObject *filename = PyUnicode_DecodeFSDefault(filename_str);
if (filename == NULL){
Py_DECREF(message);
return -1;
}
PyObject *module = NULL;
int ret = -1;

if (message == NULL || filename == NULL)
goto exit;
if (module_str != NULL){
module = PyUnicode_FromString(module_str);
if (module == NULL)
goto exit;
if (module == NULL){
Py_DECREF(filename);
Py_DECREF(message);
return -1;
}
}

ret = PyErr_WarnExplicitObject(category, message, filename, lineno,
module, registry);

exit:
Py_XDECREF(message);
int ret = PyErr_WarnExplicitObject(category, message, filename, lineno,
module, registry);
Py_XDECREF(module);
Py_XDECREF(filename);
Py_DECREF(filename);
Py_DECREF(message);
return ret;
}

Expand Down