[Python-checkins] python/dist/src/Objects dictobject.c,2.163,2.164

[rhettinger at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10801

Modified Files:
	dictobject.c 
Log Message:
SF bug #1183742: PyDict_Copy() can return non-NULL value on error



Index: dictobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/dictobject.c,v
retrieving revision 2.163
retrieving revision 2.164
diff -u -d -r2.163 -r2.164
--- dictobject.c	5 Feb 2005 23:42:57 -0000	2.163
+++ dictobject.c	15 Apr 2005 15:58:42 -0000	2.164
@@ -1291,7 +1291,7 @@
 	if (PyDict_Merge(copy, o, 1) == 0)
 		return copy;
 	Py_DECREF(copy);
-	return copy;
+	return NULL;
 }
 
 int