traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

a KeyboardInterrupt since PyTuple_Pack was passed a NULL.

Will backport.
This commit is contained in:
Neal Norwitz 2006-06-28 06:28:31 +00:00
parent 7983c7298d
commit 0f8b31a2da
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Misc/NEWS
View File

@ -28,6 +28,12 @@ Library
- The wsgiref package is now installed properly on Unix. - 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 Build
----- -----

8
Modules/cPickle.c
View File

@ -3628,10 +3628,14 @@ Instance_New(PyObject *cls, PyObject *args)
err: err:
{ {
PyObject *tp, *v, *tb; PyObject *tp, *v, *tb, *tmp_value;
PyErr_Fetch(&tp, &v, &tb); 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); Py_XDECREF(v);
v=r; v=r;
} }