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

TYPE_SMALL_TUPLE

Issue #19437: Fix r_object() of marshal module, handle r_byte() failure for
TYPE_SMALL_TUPLE
1b92d846 · Victor Stinner · 4b941b9c · 1b92d846
Commit 1b92d846 authored Oct 31, 2013 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

Python/marshal.c Python/marshal.c +2 -0

No files found.
--- 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);