Fix bug #1512695: cPickle.loads could crash if it was interrupted with

neal.norwitz · neal.norwitz · commit 5e93eedabbfc · 2006-06-28T06:28:31.000Z
a KeyboardInterrupt since PyTuple_Pack was passed a NULL. Will backport. git-svn-id: http://svn.python.org/projects/python/trunk@47139 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -28,6 +28,12 @@ Library
 
 - The wsgiref package is now installed properly on Unix.
 
+Extension Modules
+-----------------
+
+- Bug #1512695: cPickle.loads could crash if it was interrupted with
+  a KeyboardInterrupt.
+
 Build
 -----
 
diff --git a/Modules/cPickle.c b/Modules/cPickle.c
@@ -3628,10 +3628,14 @@ Instance_New(PyObject *cls, PyObject *args)
 
   err:
 	{
-		PyObject *tp, *v, *tb;
+		PyObject *tp, *v, *tb, *tmp_value;
 
 		PyErr_Fetch(&tp, &v, &tb);
-		if ((r=PyTuple_Pack(3,v,cls,args))) {
+		tmp_value = v;
+		/* NULL occurs when there was a KeyboardInterrupt */
+		if (tmp_value == NULL)
+			tmp_value = Py_None;
+		if ((r = PyTuple_Pack(3, tmp_value, cls, args))) {
 			Py_XDECREF(v);
 			v=r;
 		}
