Issue #18408: Fix marshal reader for Unicode strings: handle

PyUnicode_DecodeUTF8() failure (ex: MemoryError).

Issue #18408: Fix marshal reader for Unicode strings: handle
PyUnicode_DecodeUTF8() failure (ex: MemoryError).
e7fcd912 · Victor Stinner · ec291453 · e7fcd912
Commit e7fcd912 authored Jul 08, 2013 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Python/marshal.c Python/marshal.c +4 -0

No files found.
--- 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;