commit b1b7b1834b5b5dd989b0295a3be3401569714ccc
author Victor Stinner <victor.stinner@gmail.com> Thu Oct 31 17:07:08 2013 +0100
committer Victor Stinner <victor.stinner@gmail.com> Thu Oct 31 17:07:08 2013 +0100
tree 2347521b4013eb3b01dcdadf333dd4754707d9c7
parent 763b0d19c94b59b37fa140b8c578f141422e0d25

Issue #19437: Fix r_object() of marshal module, handle r_byte() failure for
TYPE_SMALL_TUPLE

Python/marshal.c

diff --git a/Python/marshal.c b/Python/marshal.c
index 411f1e0..598269f 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1101,6 +1101,8 @@
 
     case TYPE_SMALL_TUPLE:
         n = (unsigned char) r_byte(p);
+        if (PyErr_Occurred())
+            break;
         goto _read_tuple;
     case TYPE_TUPLE:
         n = r_long(p);