Skip to content

gh-111789: Use PyDict_GetItemRef() in Python/codecs.c #112082

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
ambv merged 3 commits into from
Nov 27, 2023
Merged

gh-111789: Use PyDict_GetItemRef() in Python/codecs.c #112082

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23ea7b2
gh-111789: Use PyDict_GetItemRef() in Python/codecs.c
serhiy-storchaka Nov 14, 2023
6027dee
Merge branch 'main' into use-dict_getitemref-Python/codecs.c
serhiy-storchaka Nov 14, 2023
8a81891
Merge branch 'main' into use-dict_getitemref-Python/codecs.c
serhiy-storchaka Nov 15, 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
9 changes: 4 additions & 5 deletions Python/codecs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,14 @@ PyObject *_PyCodec_Lookup(const char *encoding)
PyUnicode_InternInPlace(&v);

/* First, try to lookup the name in the registry dictionary */
PyObject *result = PyDict_GetItemWithError(interp->codec_search_cache, v);
PyObject *result;
if (PyDict_GetItemRef(interp->codec_search_cache, v, &result) < 0) {
goto onError;
}
if (result != NULL) {
Py_INCREF(result);
Py_DECREF(v);
return result;
}
else if (PyErr_Occurred()) {
goto onError;
}

/* Next, scan the search functions in order of registration */
const Py_ssize_t len = PyList_Size(interp->codec_search_path);
Expand Down