diff options
| author | Dong-hee Na <donghee.na@python.org> | 2021-12-30 03:35:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-30 03:35:45 (GMT) |
| commit | fb44d0589615590b1e7895ba78a038e96b15a219 (patch) | |
| tree | b4c7a6b04d689735101afc3f5f9afd5146f190e7 /Objects | |
| parent | d12bec69931503be78cd555cf7bc22ad6f4f2bd5 (diff) | |
| download | cpython-fb44d0589615590b1e7895ba78a038e96b15a219.zip cpython-fb44d0589615590b1e7895ba78a038e96b15a219.tar.gz cpython-fb44d0589615590b1e7895ba78a038e96b15a219.tar.bz2 | |
bpo-46085: Fix iterator cache mechanism of OrderedDict. (GH-30290)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/odictobject.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Objects/odictobject.c b/Objects/odictobject.c index 9af45c6..e27bcec 100644 --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -1249,6 +1249,7 @@ PyDoc_STRVAR(odict_reversed__doc__, "od.__reversed__() <==> reversed(od)"); #define _odict_ITER_REVERSED 1 #define _odict_ITER_KEYS 2 #define _odict_ITER_VALUES 4 +#define _odict_ITER_ITEMS (_odict_ITER_KEYS|_odict_ITER_VALUES) /* forward */ static PyObject * odictiter_new(PyODictObject *, int); @@ -1666,7 +1667,7 @@ odictiter_dealloc(odictiterobject *di) _PyObject_GC_UNTRACK(di); Py_XDECREF(di->di_odict); Py_XDECREF(di->di_current); - if (di->kind & (_odict_ITER_KEYS | _odict_ITER_VALUES)) { + if ((di->kind & _odict_ITER_ITEMS) == _odict_ITER_ITEMS) { Py_DECREF(di->di_result); } PyObject_GC_Del(di); @@ -1872,15 +1873,16 @@ odictiter_new(PyODictObject *od, int kind) if (di == NULL) return NULL; - if (kind & (_odict_ITER_KEYS | _odict_ITER_VALUES)){ + if ((kind & _odict_ITER_ITEMS) == _odict_ITER_ITEMS) { di->di_result = PyTuple_Pack(2, Py_None, Py_None); if (di->di_result == NULL) { Py_DECREF(di); return NULL; } } - else + else { di->di_result = NULL; + } di->kind = kind; node = reversed ? _odict_LAST(od) : _odict_FIRST(od); |