From b1b7b1834b5b5dd989b0295a3be3401569714ccc Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 31 Oct 2013 17:07:08 +0100
Subject: [PATCH] Issue #19437: Fix r_object() of marshal module, handle
 r_byte() failure for TYPE_SMALL_TUPLE

---
 Python/marshal.c | 2 ++
 1 file changed, 2 insertions(+)

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