Skip to content

gh-105375: Improve PyErr_WarnExplicit() error handling #105610

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
merged 7 commits into from
Jun 11, 2023
Merged

gh-105375: Improve PyErr_WarnExplicit() error handling #105610

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1603759
gh-105375: Improve PyErr_WarnExplicit() error handling
erlend-aasland Jun 9, 2023
7fe31c2
Fix maybe-uinitialized warning
erlend-aasland Jun 10, 2023
f07fce8
Pull in main
erlend-aasland Jun 10, 2023
91c7c6c
'module' can also be uninitialized
erlend-aasland Jun 10, 2023
d05d740
Don't 'goto exit' for the first error check
erlend-aasland Jun 10, 2023
5c5100a
Rewrite it
erlend-aasland Jun 10, 2023
b7f3245
Also decref 'message' and 'filename'
erlend-aasland Jun 10, 2023
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 number Diff line number Diff 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.
8 changes: 6 additions & 2 deletions Python/_warnings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,12 +1298,16 @@ PyErr_WarnExplicit(PyObject *category, const char *text,
const char *module_str, PyObject *registry)
{
PyObject *message = PyUnicode_FromString(text);
if (message == NULL) {
goto exit;
}
PyObject *filename = PyUnicode_DecodeFSDefault(filename_str);
if (filename == NULL) {
goto exit;
}
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)
Expand Down