From: Guido van Rossum <guido@python.org>
Date: Thu, 10 May 2007 17:35:11 +0000 (+0000)
Subject: Merged revisions 55228 via svnmerge from
X-Git-Tag: v3.0a1~968
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b116a3187705fd04bb16bf5028d21ca14284249;p=python

Merged revisions 55228 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk

................
  r55228 | guido.van.rossum | 2007-05-10 10:25:43 -0700 (Thu, 10 May 2007) | 9 lines

  Merged revisions 55227 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r55227 | guido.van.rossum | 2007-05-10 10:20:15 -0700 (Thu, 10 May 2007) | 2 lines

    Fix a bug in test_c_api() that caused a negative refcount.
  ........
................
---

diff --git a/Objects/setobject.c b/Objects/setobject.c
index 65ca8b19da..91f44d5d4e 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -2222,7 +2222,7 @@ test_c_api(PySetObject *so)
 	Py_ssize_t count;
 	char *s;
 	Py_ssize_t i;
-	PyObject *elem, *dup, *t, *f, *dup2;
+	PyObject *elem=NULL, *dup=NULL, *t, *f, *dup2, *x;
 	PyObject *ob = (PyObject *)so;
 
 	/* Verify preconditions and exercise type/size checks */
@@ -2268,8 +2268,8 @@ test_c_api(PySetObject *so)
 
 	/* Exercise direct iteration */
 	i = 0, count = 0;
-	while (_PySet_Next((PyObject *)dup, &i, &elem)) {
-		s = PyString_AsString(elem);
+	while (_PySet_Next((PyObject *)dup, &i, &x)) {
+		s = PyString_AsString(x);
 		assert(s && (s[0] == 'a' || s[0] == 'b' || s[0] == 'c'));
 		count++;
 	}