[Python-checkins] python/dist/src/Objects typeobject.c,2.126.4.9,2.126.4.10

2002年4月17日 22:11:52 -0700

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv11964/Objects
Modified Files:
 Tag: release22-maint
	typeobject.c 
Log Message:
backport gvanrossum's patch:
SF bug #541883 (Vincent Fiack).
A stupid bug in object_set_class(): didn't check for value==NULL
before checking its type.
Bugfix candidate.
Original patches were:
python/dist/src/Objects/typeobject.c:2.142
Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.126.4.9
retrieving revision 2.126.4.10
diff -C2 -d -r2.126.4.9 -r2.126.4.10
*** typeobject.c	18 Apr 2002 04:47:10 -0000	2.126.4.9
--- typeobject.c	18 Apr 2002 05:11:50 -0000	2.126.4.10
***************
*** 1590,1593 ****
--- 1590,1598 ----
 	PyTypeObject *new, *newbase, *oldbase;
 
+ 	if (value == NULL) {
+ 		PyErr_SetString(PyExc_TypeError,
+ 				"can't delete __class__ attribute");
+ 		return -1;
+ 	}
 	if (!PyType_Check(value)) {
 		PyErr_Format(PyExc_TypeError,