[Python-checkins] python/dist/src/Objects typeobject.c,2.264,2.265

rhettinger at users.sourceforge.net rhettinger at users.sourceforge.net
Thu Mar 3 17:45:23 CET 2005


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

Modified Files:
	typeobject.c 
Log Message:
SF bug #1155938: Missing None check for __init__().

Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.264
retrieving revision 2.265
diff -u -d -r2.264 -r2.265
--- typeobject.c	23 Sep 2004 02:39:37 -0000	2.264
+++ typeobject.c	3 Mar 2005 16:45:19 -0000	2.265
@@ -4753,6 +4753,12 @@
 	Py_DECREF(meth);
 	if (res == NULL)
 		return -1;
+	if (res != Py_None) {
+		PyErr_SetString(PyExc_TypeError,
+			   "__init__() should return None");
+		Py_DECREF(res);
+		return -1;
+	}
 	Py_DECREF(res);
 	return 0;
 }



More information about the Python-checkins mailing list