From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 8 Nov 2010 23:34:29 +0000 (+0000)
Subject: PyUnicode_DecodeFSDefaultAndSize() raises MemoryError if _Py_char2wchar() fails
X-Git-Tag: v3.2a4~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5af0a5df0621fbac3eb21e444d58a95975cd2ca;p=thirdparty%2FPython%2Fcpython.git

PyUnicode_DecodeFSDefaultAndSize() raises MemoryError if _Py_char2wchar() fails
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 2250f45e9a37..d6cc8b5a24d4 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1811,7 +1811,7 @@ PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
 
         wchar = _Py_char2wchar(s, &len);
         if (wchar == NULL)
-            return NULL;
+            return PyErr_NoMemory();
 
         unicode = PyUnicode_FromWideChar(wchar, len);
         PyMem_Free(wchar);