Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #19437: Fix _pickle, don't call _Unpickler_SkipConsumed() with an 

exception set
This commit is contained in:
Victor Stinner 2013-10-31 13:39:23 +01:00
parent b43ad1d569
commit 2ae57e3cf8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/_pickle.c
View File

@ -5430,9 +5430,6 @@ load(UnpicklerObject *self)
break; /* and we are done! */
}
if (_Unpickler_SkipConsumed(self) < 0)
return NULL;
/* XXX: It is not clear what this is actually for. */
if ((err = PyErr_Occurred())) {
if (err == PyExc_EOFError) {
@ -5441,6 +5438,9 @@ load(UnpicklerObject *self)
return NULL;
}
if (_Unpickler_SkipConsumed(self) < 0)
return NULL;
PDATA_POP(self->stack, value);
return value;
}