[Python-checkins] python/dist/src/Python pythonrun.c, 2.161.2.8, 2.161.2.9

[nnorwitz at users.sourceforge.net]

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

Modified Files:
      Tag: ast-branch
	pythonrun.c 
Log Message:
fix crash on Ctrl-C (and NoMemory too)

Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.161.2.8
retrieving revision 2.161.2.9
diff -C2 -d -r2.161.2.8 -r2.161.2.9
*** pythonrun.c	28 Apr 2003 17:16:47 -0000	2.161.2.8
--- pythonrun.c	31 Dec 2003 15:00:06 -0000	2.161.2.9
***************
*** 1301,1309 ****
  	case E_INTR:
  		PyErr_SetNone(PyExc_KeyboardInterrupt);
- 		Py_XDECREF(v);
  		return;
  	case E_NOMEM:
  		PyErr_NoMemory();
- 		Py_XDECREF(v);
  		return;
  	case E_EOF:
--- 1301,1307 ----
***************
*** 1347,1351 ****
  		err->text = NULL;
  	}
! 	w = Py_BuildValue("(sO)", msg, v);
  	Py_XDECREF(u);
  	Py_XDECREF(v);
--- 1345,1351 ----
  		err->text = NULL;
  	}
! 	w = NULL;
! 	if (v != NULL)
! 		w = Py_BuildValue("(sO)", msg, v);
  	Py_XDECREF(u);
  	Py_XDECREF(v);