8000 gh-116664: Ensure thread-safe dict access in _warnings by erlend-aasland · Pull Request #116768 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-116664: Ensure thread-safe dict access in _warnings #116768

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 6 commits into from
Mar 18, 2024
Merged

gh-116664: Ensure thread-safe dict access in _warnings #116768

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cda2f6f
In already_warned, replace _PyDict_GetItemWithError with PyDict_GetIt…
erlend-aasland Mar 12, 2024
d05c678
In setup_context, replace _PyDict_GetItemWithError with PyDict_GetIte…
erlend-aasland Mar 12, 2024
eeb0936
In setup_context, replace _PyDict_GetItemWithError with PyDict_GetIte…
erlend-aasland Mar 12, 2024
4d4371c
In get_source_line, replace _PyDict_GetItemWithError with PyDict_GetI…
erlend-aasland Mar 12, 2024
4f3cd02
Address review: handle case where __name__ is not None and not a unic…
erlend-aasland Mar 13, 2024
062ec1a
Merge branch 'main' into nogil/warnings-dict-getitem
erlend-aasland Mar 18, 2024
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
Prev Previous commit
Next Next commit
In get_source_line, replace _PyDict_GetItemWithError with PyDict_GetI… 
…temRef
  • Loading branch information
@erlend-aasland
erlend-aasland committed Mar 13, 2024
commit 4d4371c782a6add47ac9197f67627874b7ffe043
7 changes: 3 additions & 4 deletions Python/_warnings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "Python.h"
#include "pycore_dict.h" // _PyDict_GetItemWithError()
#include "pycore_interp.h" // PyInterpreterState.warnings
#include "pycore_long.h" // _PyLong_GetZero()
#include "pycore_pyerrors.h" // _PyErr_Occurred()
Expand Down Expand Up @@ -1065,12 +1064,12 @@ get_source_line(PyInterpreterState *interp, PyObject *module_globals, int lineno
return NULL;
}

module_name = _PyDict_GetItemWithError(module_globals, &_Py_ID(__name__));
if (!module_name) {
int rc = PyDict_GetItemRef(module_globals, &_Py_ID(__name__),
&module_name);
if (rc < 0 || rc == 0) {
Py_DECREF(loader);
return NULL;
}
Py_INCREF(module_name);

/* Make sure the loader implements the optional get_source() method. */
(void)PyObject_GetOptionalAttr(loader, &_Py_ID(get_source), &get_source);
Expand Down
0