From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 31 Oct 2013 16:07:08 +0000 (+0100)
Subject: Issue #19437: Fix r_object() of marshal module, handle r_byte() failure for
X-Git-Tag: v3.4.0b1~447
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1b7b1834b5b5dd989b0295a3be3401569714ccc;p=python

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

diff --git a/Python/marshal.c b/Python/marshal.c
index 411f1e0782..598269fa72 100644
--- 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);