[Python-checkins] python/dist/src/Python import.c, 2.222.6.1, 2.222.6.2

[loewis at users.sourceforge.net]

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

Modified Files:
      Tag: release23-maint
	import.c 
Log Message:
Decref all if ensure_fromlist fails. Fixes #876533.


Index: import.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/import.c,v
retrieving revision 2.222.6.1
retrieving revision 2.222.6.2
diff -C2 -d -r2.222.6.1 -r2.222.6.2
*** import.c	20 Oct 2003 14:34:48 -0000	2.222.6.1
--- import.c	23 Mar 2004 16:28:45 -0000	2.222.6.2
***************
*** 2179,2185 ****
  				PyErr_Clear();
  			else {
! 				if (!ensure_fromlist(mod, all, buf, buflen, 1))
! 					return 0;
  				Py_DECREF(all);
  			}
  			continue;
--- 2179,2186 ----
  				PyErr_Clear();
  			else {
! 				int ret = ensure_fromlist(mod, all, buf, buflen, 1);
  				Py_DECREF(all);
+ 				if (!ret)
+ 					return 0;
  			}
  			continue;