Commit 2ae57e3c authored by Victor Stinner's avatar Victor Stinner

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

exception set
parent b43ad1d5
...@@ -5430,9 +5430,6 @@ load(UnpicklerObject *self) ...@@ -5430,9 +5430,6 @@ load(UnpicklerObject *self)
break; /* and we are done! */ break; /* and we are done! */
} }
if (_Unpickler_SkipConsumed(self) < 0)
return NULL;
/* XXX: It is not clear what this is actually for. */ /* XXX: It is not clear what this is actually for. */
if ((err = PyErr_Occurred())) { if ((err = PyErr_Occurred())) {
if (err == PyExc_EOFError) { if (err == PyExc_EOFError) {
...@@ -5441,6 +5438,9 @@ load(UnpicklerObject *self) ...@@ -5441,6 +5438,9 @@ load(UnpicklerObject *self)
return NULL; return NULL;
} }
if (_Unpickler_SkipConsumed(self) < 0)
return NULL;
PDATA_POP(self->stack, value); PDATA_POP(self->stack, value);
return value; return value;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment