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

TYPE_SMALL_TUPLE
2013-10-31 17:07:08 +01:00
parent 763b0d19c9
commit b1b7b1834b
1 changed files with 2 additions and 0 deletions
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1101,6 +1101,8 @@ r_object(RFILE *p)

    case TYPE_SMALL_TUPLE:
        n = (unsigned char) r_byte(p);
+        if (PyErr_Occurred())
+            break;
        goto _read_tuple;
    case TYPE_TUPLE:
        n = r_long(p);