diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-10-31 17:07:08 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-10-31 17:07:08 +0100 |
| commit | b1b7b1834b5b5dd989b0295a3be3401569714ccc (patch) | |
| tree | 2347521b4013eb3b01dcdadf333dd4754707d9c7 /Python | |
| parent | 763b0d19c94b59b37fa140b8c578f141422e0d25 (diff) | |
| download | cpython-git-b1b7b1834b5b5dd989b0295a3be3401569714ccc.tar.gz | |
Issue #19437: Fix r_object() of marshal module, handle r_byte() failure for
TYPE_SMALL_TUPLE
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/marshal.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); |