From: Guido van Rossum <guido@python.org>
Date: Sat, 20 Mar 2004 19:11:58 +0000 (+0000)
Subject: GCC was complaining that 'value' in dictiter_iternextvalue() wasn't
X-Git-Tag: v2.4a1~665
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09240f65f8becdb72bb72bd44817e11c7192b24f;p=python

GCC was complaining that 'value' in dictiter_iternextvalue() wasn't
necessarily always set before used.  Between Tim, Armin & me we
couldn't prove GCC wrong, so we decided to fix the algorithm.  This
version is Armin's.
---

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 3e369617a7..0f2a271af4 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -2148,15 +2148,16 @@ static PyObject *dictiter_iternextvalue(dictiterobject *di)
 	}
 
 	i = di->di_pos;
-	if (i < 0)
+	mask = d->ma_mask;
+	if (i < 0 || i > mask)
 		goto fail;
 	ep = d->ma_table;
-	mask = d->ma_mask;
-	while (i <= mask && (value=ep[i].me_value) == NULL)
+	while ((value=ep[i].me_value) == NULL) {
 		i++;
+		if (i > mask)
+			goto fail;
+	}
 	di->di_pos = i+1;
-	if (i > mask)
-		goto fail;
 	di->len--;
 	Py_INCREF(value);
 	return value;