bpo-38555: Fix an undefined behavior. (GH-16883)

miss-islington · serhiy-storchaka · web-flow · commit c5d3ea89ee52 · 2019-10-23T05:07:23.000-07:00
(cherry picked from commit 2e3d873) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -3840,22 +3840,21 @@ dictreviter_iternext(dictiterobject *di)
     PyDictKeysObject *k = d->ma_keys;
     PyObject *key, *value, *result;
 
+    if (i < 0) {
+        goto fail;
+    }
     if (d->ma_values) {
-        if (i < 0) {
-            goto fail;
-        }
         key = DK_ENTRIES(k)[i].me_key;
         value = d->ma_values[i];
         assert (value != NULL);
     }
     else {
         PyDictKeyEntry *entry_ptr = &DK_ENTRIES(k)[i];
-        while (i >= 0 && entry_ptr->me_value == NULL) {
+        while (entry_ptr->me_value == NULL) {
+            if (--i < 0) {
+                goto fail;
+            }
             entry_ptr--;
-            i--;
-        }
-        if (i < 0) {
-            goto fail;
         }
         key = entry_ptr->me_key;
         value = entry_ptr->me_value;
