[Python-checkins] python/dist/src/Objects dictobject.c, 2.162, 2.162.4.1

[rhettinger at users.sourceforge.net]

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

Modified Files:
      Tag: release24-maint
	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.162
retrieving revision 2.162.4.1
diff -u -d -r2.162 -r2.162.4.1
--- dictobject.c	15 Jul 2004 15:54:04 -0000	2.162
+++ dictobject.c	15 Apr 2005 16:07:09 -0000	2.162.4.1
@@ -1289,7 +1289,7 @@
 	if (PyDict_Merge(copy, o, 1) == 0)
 		return copy;
 	Py_DECREF(copy);
-	return copy;
+	return NULL;
 }
 
 int