ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

gh-112066: Use PyDict_SetDefaultRef in place of PyDict_SetDefault. (#112211)

Browse source 
This changes a number of internal usages of `PyDict_SetDefault` to use `PyDict_SetDefaultRef`.

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
This commit is contained in:
Sam Gross 2024-02-07 13:43:18 -05:00 • committed by GitHub
parent fedbf77191
commit ef3ceab09d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Modules/_json.c
View file

@ -691,11 +691,10 @@ _parse_object_unicode(PyScannerObject *s, PyObject *memo, PyObject *pystr, Py_ss
key = scanstring_unicode(pystr, idx + 1, s->strict, &next_idx);
if (key == NULL)
goto bail;
memokey = PyDict_SetDefault(memo, key, key);
if (memokey == NULL) {
if (PyDict_SetDefaultRef(memo, key, key, &memokey) < 0) {
goto bail;
}
Py_SETREF(key, Py_NewRef(memokey));
Py_SETREF(key, memokey);
idx = next_idx;
/* skip whitespace between key and : delimiter, read :, skip whitespace */

2
Modules/posixmodule.c
View file

@ -1627,7 +1627,7 @@ convertenviron(void)
Py_DECREF(d);
return NULL;
}
if (PyDict_SetDefault(d, k, v) == NULL) {
if (PyDict_SetDefaultRef(d, k, v, NULL) < 0) {
Py_DECREF(v);
Py_DECREF(k);
Py_DECREF(d);

3
Modules/pyexpat.c
View file

@ -1615,7 +1615,8 @@ static int init_handler_descrs(pyexpat_state *state)
if (descr == NULL)
return -1;
if (PyDict_SetDefault(state->xml_parse_type->tp_dict, PyDescr_NAME(descr), descr) == NULL) {
if (PyDict_SetDefaultRef(state->xml_parse_type->tp_dict,
PyDescr_NAME(descr), descr, NULL) < 0) {
Py_DECREF(descr);
return -1;
}