]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
PyUnicode_DecodeFSDefaultAndSize() raises MemoryError if _Py_char2wchar() fails
authorVictor Stinner <victor.stinner@haypocalc.com>
Mon, 8 Nov 2010 23:34:29 +0000 (23:34 +0000)
committerVictor Stinner <victor.stinner@haypocalc.com>
Mon, 8 Nov 2010 23:34:29 +0000 (23:34 +0000)
Objects/unicodeobject.c

index 2250f45e9a379c2c60c441f2f0615f84dc91146a..d6cc8b5a24d45b26c0f27d21c3a3aeb613386a23 100644 (file)
@@ -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);