Skip to content

Commit a24107b

Browse files
serhiy-storchakaserhiy-storchaka
authored
bpo-35459: Use PyDict_GetItemWithError() instead of PyDict_GetItem(). (GH-11112)
1 parent a180b00 commit a24107b

31 files changed

+538
-242
lines changed

‎Include/cpython/dictobject.h

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ PyAPI_FUNC(PyObject *) _PyDict_GetItem_KnownHash(PyObject *mp, PyObject *key,
3535
Py_hash_t hash);
3636
PyAPI_FUNC(PyObject *) _PyDict_GetItemIdWithError(PyObject *dp,
3737
struct _Py_Identifier *key);
38+
PyAPI_FUNC(PyObject *) _PyDict_GetItemStringWithError(PyObject *, const char *);
3839
PyAPI_FUNC(PyObject *) PyDict_SetDefault(
3940
PyObject *mp, PyObject *key, PyObject *defaultobj);
4041
PyAPI_FUNC(int) _PyDict_SetItem_KnownHash(PyObject *mp, PyObject *key,

‎Modules/_csv.c

+7-3
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ get_dialect_from_registry(PyObject * name_obj)
132132
{
133133
PyObject *dialect_obj;
134134

135-
dialect_obj = PyDict_GetItem(_csvstate_global->dialects, name_obj);
135+
dialect_obj = PyDict_GetItemWithError(_csvstate_global->dialects, name_obj);
136136
if (dialect_obj == NULL) {
137137
if (!PyErr_Occurred())
138138
PyErr_Format(_csvstate_global->error_obj, "unknown dialect");
@@ -1434,8 +1434,12 @@ csv_register_dialect(PyObject *module, PyObject *args, PyObject *kwargs)
14341434
static PyObject *
14351435
csv_unregister_dialect(PyObject *module, PyObject *name_obj)
14361436
{
1437-
if (PyDict_DelItem(_csvstate_global->dialects, name_obj) < 0)
1438-
return PyErr_Format(_csvstate_global->error_obj, "unknown dialect");
1437+
if (PyDict_DelItem(_csvstate_global->dialects, name_obj) < 0) {
1438+
if (PyErr_ExceptionMatches(PyExc_KeyError)) {
1439+
PyErr_Format(_csvstate_global->error_obj, "unknown dialect");
1440+
}
1441+
return NULL;
1442+
}
14391443
Py_RETURN_NONE;
14401444
}
14411445

‎Modules/_elementtree.c

+13-7
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ get_attrib_from_keywords(PyObject *kwds)
339339
if (attrib_str == NULL) {
340340
return NULL;
341341
}
342-
PyObject *attrib = PyDict_GetItem(kwds, attrib_str);
342+
PyObject *attrib = PyDict_GetItemWithError(kwds, attrib_str);
343343

344344
if (attrib) {
345345
/* If attrib was found in kwds, copy its value and remove it from
@@ -356,7 +356,8 @@ get_attrib_from_keywords(PyObject *kwds)
356356
Py_DECREF(attrib);
357357
attrib = NULL;
358358
}
359-
} else {
359+
}
360+
else if (!PyErr_Occurred()) {
360361
attrib = PyDict_New();
361362
}
362363

@@ -1393,9 +1394,13 @@ _elementtree_Element_get_impl(ElementObject *self, PyObject *key,
13931394
if (!self->extra || self->extra->attrib == Py_None)
13941395
value = default_value;
13951396
else {
1396-
value = PyDict_GetItem(self->extra->attrib, key);
1397-
if (!value)
1397+
value = PyDict_GetItemWithError(self->extra->attrib, key);
1398+
if (!value) {
1399+
if (PyErr_Occurred()) {
1400+
return NULL;
1401+
}
13981402
value = default_value;
1403+
}
13991404
}
14001405

14011406
Py_INCREF(value);
@@ -2848,11 +2853,12 @@ makeuniversal(XMLParserObject* self, const char* string)
28482853
if (!key)
28492854
return NULL;
28502855

2851-
value = PyDict_GetItem(self->names, key);
2856+
value = PyDict_GetItemWithError(self->names, key);
28522857

28532858
if (value) {
28542859
Py_INCREF(value);
2855-
} else {
2860+
}
2861+
else if (!PyErr_Occurred()) {
28562862
/* new name. convert to universal name, and decode as
28572863
necessary */
28582864

@@ -2974,7 +2980,7 @@ expat_default_handler(XMLParserObject* self, const XML_Char* data_in,
29742980
if (!key)
29752981
return;
29762982

2977-
value = PyDict_GetItem(self->entity, key);
2983+
value = PyDict_GetItemWithError(self->entity, key);
29782984

29792985
if (value) {
29802986
if (TreeBuilder_CheckExact(self->target))

‎Modules/_json.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -746,12 +746,15 @@ _parse_object_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ss
746746
key = scanstring_unicode(pystr, idx + 1, s->strict, &next_idx);
747747
if (key == NULL)
748748
goto bail;
749-
memokey = PyDict_GetItem(s->memo, key);
749+
memokey = PyDict_GetItemWithError(s->memo, key);
750750
if (memokey != NULL) {
751751
Py_INCREF(memokey);
752752
Py_DECREF(key);
753753
key = memokey;
754754
}
755+
else if (PyErr_Occurred()) {
756+
goto bail;
757+
}
755758
else {
756759
if (PyDict_SetItem(s->memo, key, key) < 0)
757760
goto bail;

‎Modules/_sre.c

+26-32
Original file line numberDiff line numberDiff line change
@@ -1899,15 +1899,7 @@ match_getslice_by_index(MatchObject* self, Py_ssize_t index, PyObject* def)
18991899
void* ptr;
19001900
Py_ssize_t i, j;
19011901

1902-
if (index < 0 || index >= self->groups) {
1903-
/* raise IndexError if we were given a bad group number */
1904-
PyErr_SetString(
1905-
PyExc_IndexError,
1906-
"no such group"
1907-
);
1908-
return NULL;
1909-
}
1910-
1902+
assert(0 <= index && index < self->groups);
19111903
index *= 2;
19121904

19131905
if (self->string == Py_None || self->mark[index] < 0) {
@@ -1940,25 +1932,39 @@ match_getindex(MatchObject* self, PyObject* index)
19401932
return 0;
19411933

19421934
if (PyIndex_Check(index)) {
1943-
return PyNumber_AsSsize_t(index, NULL);
1935+
i = PyNumber_AsSsize_t(index, NULL);
19441936
}
1937+
else {
1938+
i = -1;
19451939

1946-
i = -1;
1947-
1948-
if (self->pattern->groupindex) {
1949-
index = PyDict_GetItem(self->pattern->groupindex, index);
1950-
if (index && PyLong_Check(index)) {
1951-
i = PyLong_AsSsize_t(index);
1940+
if (self->pattern->groupindex) {
1941+
index = PyDict_GetItemWithError(self->pattern->groupindex, index);
1942+
if (index && PyLong_Check(index)) {
1943+
i = PyLong_AsSsize_t(index);
1944+
}
19521945
}
19531946
}
1947+
if (i < 0 || i >= self->groups) {
1948+
/* raise IndexError if we were given a bad group number */
1949+
if (!PyErr_Occurred()) {
1950+
PyErr_SetString(PyExc_IndexError, "no such group");
1951+
}
1952+
return -1;
1953+
}
19541954

19551955
return i;
19561956
}
19571957

19581958
static PyObject*
19591959
match_getslice(MatchObject* self, PyObject* index, PyObject* def)
19601960
{
1961-
return match_getslice_by_index(self, match_getindex(self, index), def);
1961+
Py_ssize_t i = match_getindex(self, index);
1962+
1963+
if (i < 0) {
1964+
return NULL;
1965+
}
1966+
1967+
return match_getslice_by_index(self, i, def);
19621968
}
19631969

19641970
/*[clinic input]
@@ -2114,11 +2120,7 @@ _sre_SRE_Match_start_impl(MatchObject *self, PyObject *group)
21142120
{
21152121
Py_ssize_t index = match_getindex(self, group);
21162122

2117-
if (index < 0 || index >= self->groups) {
2118-
PyErr_SetString(
2119-
PyExc_IndexError,
2120-
"no such group"
2121-
);
2123+
if (index < 0) {
21222124
return -1;
21232125
}
21242126

@@ -2141,11 +2143,7 @@ _sre_SRE_Match_end_impl(MatchObject *self, PyObject *group)
21412143
{
21422144
Py_ssize_t index = match_getindex(self, group);
21432145

2144-
if (index < 0 || index >= self->groups) {
2145-
PyErr_SetString(
2146-
PyExc_IndexError,
2147-
"no such group"
2148-
);
2146+
if (index < 0) {
21492147
return -1;
21502148
}
21512149

@@ -2195,11 +2193,7 @@ _sre_SRE_Match_span_impl(MatchObject *self, PyObject *group)
21952193
{
21962194
Py_ssize_t index = match_getindex(self, group);
21972195

2198-
if (index < 0 || index >= self->groups) {
2199-
PyErr_SetString(
2200-
PyExc_IndexError,
2201-
"no such group"
2202-
);
2196+
if (index < 0) {
22032197
return NULL;
22042198
}
22052199

‎Modules/_struct.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -2088,12 +2088,15 @@ cache_struct_converter(PyObject *fmt, PyStructObject **ptr)
20882088
return 0;
20892089
}
20902090

2091-
s_object = PyDict_GetItem(cache, fmt);
2091+
s_object = PyDict_GetItemWithError(cache, fmt);
20922092
if (s_object != NULL) {
20932093
Py_INCREF(s_object);
20942094
*ptr = (PyStructObject *)s_object;
20952095
return Py_CLEANUP_SUPPORTED;
20962096
}
2097+
else if (PyErr_Occurred()) {
2098+
return 0;
2099+
}
20972100

20982101
s_object = PyObject_CallFunctionObjArgs((PyObject *)(&PyStructType), fmt, NULL);
20992102
if (s_object != NULL) {

‎Modules/_testmultiphase.c

+5-2
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,14 @@ static PyObject *
5353
Example_getattro(ExampleObject *self, PyObject *name)
5454
{
5555
if (self->x_attr != NULL) {
56-
PyObject *v = PyDict_GetItem(self->x_attr, name);
56+
PyObject *v = PyDict_GetItemWithError(self->x_attr, name);
5757
if (v != NULL) {
5858
Py_INCREF(v);
5959
return v;
6060
}
61+
else if (PyErr_Occurred()) {
62+
return NULL;
63+
}
6164
}
6265
return PyObject_GenericGetAttr((PyObject *)self, name);
6366
}
@@ -72,7 +75,7 @@ Example_setattr(ExampleObject *self, const char *name, PyObject *v)
7275
}
7376
if (v == NULL) {
7477
int rv = PyDict_DelItemString(self->x_attr, name);
75-
if (rv < 0)
78+
if (rv < 0 && PyErr_ExceptionMatches(PyExc_KeyError))
7679
PyErr_SetString(PyExc_AttributeError,
7780
"delete non-existing Example attribute");
7881
return rv;

‎Modules/_threadmodule.c

+16-10
Original file line numberDiff line numberDiff line change
@@ -814,8 +814,11 @@ _ldict(localobject *self)
814814
return NULL;
815815
}
816816

817-
dummy = PyDict_GetItem(tdict, self->key);
817+
dummy = PyDict_GetItemWithError(tdict, self->key);
818818
if (dummy == NULL) {
819+
if (PyErr_Occurred()) {
820+
return NULL;
821+
}
819822
ldict = _local_create_dummy(self);
820823
if (ldict == NULL)
821824
return NULL;
@@ -931,14 +934,17 @@ local_getattro(localobject *self, PyObject *name)
931934
(PyObject *)self, name, ldict, 0);
932935

933936
/* Optimization: just look in dict ourselves */
934-
value = PyDict_GetItem(ldict, name);
935-
if (value == NULL)
936-
/* Fall back on generic to get __class__ and __dict__ */
937-
return _PyObject_GenericGetAttrWithDict(
938-
(PyObject *)self, name, ldict, 0);
939-
940-
Py_INCREF(value);
941-
return value;
937+
value = PyDict_GetItemWithError(ldict, name);
938+
if (value != NULL) {
939+
Py_INCREF(value);
940+
return value;
941+
}
942+
else if (PyErr_Occurred()) {
943+
return NULL;
944+
}
945+
/* Fall back on generic to get __class__ and __dict__ */
946+
return _PyObject_GenericGetAttrWithDict(
947+
(PyObject *)self, name, ldict, 0);
942948
}
943949

944950
/* Called when a dummy is destroyed. */
@@ -958,7 +964,7 @@ _localdummy_destroyed(PyObject *localweakref, PyObject *dummyweakref)
958964
self = (localobject *) obj;
959965
if (self->dummies != NULL) {
960966
PyObject *ldict;
961-
ldict = PyDict_GetItem(self->dummies, dummyweakref);
967+
ldict = PyDict_GetItemWithError(self->dummies, dummyweakref);
962968
if (ldict != NULL) {
963969
PyDict_DelItem(self->dummies, dummyweakref);
964970
}

‎Modules/itertoolsmodule.c

+10-4
Original file line numberDiff line numberDiff line change
@@ -4418,6 +4418,7 @@ static PyTypeObject ziplongest_type;
44184418
static PyObject *
44194419
zip_longest_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
44204420
{
4421+
_Py_IDENTIFIER(fillvalue);
44214422
ziplongestobject *lz;
44224423
Py_ssize_t i;
44234424
PyObject *ittuple; /* tuple of iterators */
@@ -4426,10 +4427,15 @@ zip_longest_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
44264427
Py_ssize_t tuplesize;
44274428

44284429
if (kwds != NULL && PyDict_CheckExact(kwds) && PyDict_GET_SIZE(kwds) > 0) {
4429-
fillvalue = PyDict_GetItemString(kwds, "fillvalue");
4430-
if (fillvalue == NULL || PyDict_GET_SIZE(kwds) > 1) {
4431-
PyErr_SetString(PyExc_TypeError,
4432-
"zip_longest() got an unexpected keyword argument");
4430+
fillvalue = NULL;
4431+
if (PyDict_GET_SIZE(kwds) == 1) {
4432+
fillvalue = _PyDict_GetItemIdWithError(kwds, &PyId_fillvalue);
4433+
}
4434+
if (fillvalue == NULL) {
4435+
if (!PyErr_Occurred()) {
4436+
PyErr_SetString(PyExc_TypeError,
4437+
"zip_longest() got an unexpected keyword argument");
4438+
}
44334439
return NULL;
44344440
}
44354441
}

‎Modules/main.c

+5-1
Original file line numberDiff line numberDiff line change
@@ -508,10 +508,14 @@ pymain_free(_PyMain *pymain)
508508
static int
509509
pymain_sys_path_add_path0(PyInterpreterState *interp, PyObject *path0)
510510
{
511+
_Py_IDENTIFIER(path);
511512
PyObject *sys_path;
512513
PyObject *sysdict = interp->sysdict;
513514
if (sysdict != NULL) {
514-
sys_path = PyDict_GetItemString(sysdict, "path");
515+
sys_path = _PyDict_GetItemIdWithError(sysdict, &PyId_path);
516+
if (sys_path == NULL && PyErr_Occurred()) {
517+
goto error;
518+
}
515519
}
516520
else {
517521
sys_path = NULL;

‎Modules/posixmodule.c

+3
Original file line numberDiff line numberDiff line change
@@ -9837,6 +9837,9 @@ os_unsetenv_impl(PyObject *module, PyObject *name)
98379837
*/
98389838
if (PyDict_DelItem(posix_putenv_garbage, name)) {
98399839
/* really not much we can do; just leak */
9840+
if (!PyErr_ExceptionMatches(PyExc_KeyError)) {
9841+
return NULL;
9842+
}
98409843
PyErr_Clear();
98419844
}
98429845
Py_RETURN_NONE;

0 commit comments

Comments
 (0)