[Python-checkins] python/dist/src/Python modsupport.c,2.67,2.68

jhylton@users.sourceforge.net jhylton@users.sourceforge.net
Sat, 21 Jun 2003 14:35:27 -0700


Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1:/tmp/cvs-serv2511/Python

Modified Files:
	modsupport.c 
Log Message:
Better error message

Index: modsupport.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/modsupport.c,v
retrieving revision 2.67
retrieving revision 2.68
diff -C2 -d -r2.67 -r2.68
*** modsupport.c	17 Apr 2003 22:01:10 -0000	2.67
--- modsupport.c	21 Jun 2003 21:35:25 -0000	2.68
***************
*** 515,523 ****
  {
  	PyObject *dict;
! 	if (!PyModule_Check(m) || o == NULL) {
  		PyErr_SetString(PyExc_TypeError,
  			    "PyModule_AddObject() needs module as first arg");
  		return -1;
  	}
  	dict = PyModule_GetDict(m);
  	if (dict == NULL) {
--- 515,529 ----
  {
  	PyObject *dict;
! 	if (!PyModule_Check(m)) {
  		PyErr_SetString(PyExc_TypeError,
  			    "PyModule_AddObject() needs module as first arg");
  		return -1;
  	}
+ 	if (!o) {
+ 		PyErr_SetString(PyExc_TypeError,
+ 				"PyModule_AddObject() needs non-NULL value");
+ 		return -1;
+ 	}
+ 
  	dict = PyModule_GetDict(m);
  	if (dict == NULL) {