commit | 3a8b79d4d2b64e1a80512845edcc388b1ec76dcd | [log] [tgz] |
---|---|---|
author | Victor Stinner <victor.stinner@gmail.com> | Mon Jul 08 22:23:32 2013 +0200 |
committer | Victor Stinner <victor.stinner@gmail.com> | Mon Jul 08 22:23:32 2013 +0200 |
tree | c746322b69591f7977f3903f330ca037edc90d3e | |
parent | b27cd3e5ad9e3da24cdce7f498fa64d2994788a0 [diff] [blame] |
Issue #18408: Fix marshal reader for Unicode strings: handle PyUnicode_DecodeUTF8() failure (ex: MemoryError).
diff --git a/Python/marshal.c b/Python/marshal.c index e519fc9..e97de59 100644 --- a/Python/marshal.c +++ b/Python/marshal.c
@@ -998,6 +998,10 @@ else { v = PyUnicode_New(0, 0); } + if (v == NULL) { + retval = NULL; + break; + } if (type == TYPE_INTERNED) PyUnicode_InternInPlace(&v); retval = v;