Fix unicode_adjust_maxchar(): catch PyUnicode_New() failure

vstinner · vstinner · commit ca439eecea1f · 2012-06-16T03:17:34.000+02:00
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -2084,7 +2084,8 @@ unicode_adjust_maxchar(PyObject **p_unicode)
             return;
     }
     copy = PyUnicode_New(len, max_char);
-    _PyUnicode_FastCopyCharacters(copy, 0, unicode, 0, len);
+    if (copy != NULL)
+        _PyUnicode_FastCopyCharacters(copy, 0, unicode, 0, len);
     Py_DECREF(unicode);
     *p_unicode = copy;
 }

Original file line number	Diff line number	Diff line change
`@@ -2084,7 +2084,8 @@ unicode_adjust_maxchar(PyObject **p_unicode)`
`2084`	`2084`	`return;`
`2085`	`2085`	`}`
`2086`	`2086`	`copy = PyUnicode_New(len, max_char);`
`2087`		`- _PyUnicode_FastCopyCharacters(copy, 0, unicode, 0, len);`
	`2087`	`+ if (copy != NULL)`
	`2088`	`+ _PyUnicode_FastCopyCharacters(copy, 0, unicode, 0, len);`
`2088`	`2089`	`Py_DECREF(unicode);`
`2089`	`2090`	`*p_unicode = copy;`
`2090`	`2091`	`}`