From 3a8b79d4d2b64e1a80512845edcc388b1ec76dcd Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 8 Jul 2013 22:23:32 +0200 Subject: Issue #18408: Fix marshal reader for Unicode strings: handle PyUnicode_DecodeUTF8() failure (ex: MemoryError). --- Python/marshal.c | 4 ++++ 1 file changed, 4 insertions(+) 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 @@ r_object(RFILE *p) else { v = PyUnicode_New(0, 0); } + if (v == NULL) { + retval = NULL; + break; + } if (type == TYPE_INTERNED) PyUnicode_InternInPlace(&v); retval = v; -- cgit v0.12