PyUnicode_AsUnicodeCopy() now checks if PyUnicode_AsUnicode() failed

Victor Stinner · Victor Stinner · commit 577db2c9f067 · 2011-10-11T22:12:48.000+02:00
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -13775,13 +13775,16 @@ Py_UNICODE*
 PyUnicode_AsUnicodeCopy(PyObject *object)
 {
     PyUnicodeObject *unicode = (PyUnicodeObject *)object;
-    Py_UNICODE *copy;
+    Py_UNICODE *u, *copy;
     Py_ssize_t size;
 
     if (!PyUnicode_Check(unicode)) {
         PyErr_BadArgument();
         return NULL;
     }
+    u = PyUnicode_AsUnicode(object);
+    if (u == NULL)
+        return NULL;
     /* Ensure we won't overflow the size. */
     if (PyUnicode_GET_SIZE(unicode) > ((PY_SSIZE_T_MAX / sizeof(Py_UNICODE)) - 1)) {
         PyErr_NoMemory();
@@ -13794,7 +13797,7 @@ PyUnicode_AsUnicodeCopy(PyObject *object)
         PyErr_NoMemory();
         return NULL;
     }
-    memcpy(copy, PyUnicode_AS_UNICODE(unicode), size);
+    memcpy(copy, u, size);
     return copy;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13775,13 +13775,16 @@ Py_UNICODE*`
`13775`	`13775`	`PyUnicode_AsUnicodeCopy(PyObject *object)`
`13776`	`13776`	`{`
`13777`	`13777`	`PyUnicodeObject unicode = (PyUnicodeObject )object;`
`13778`		`- Py_UNICODE *copy;`
	`13778`	`+ Py_UNICODE u, copy;`
`13779`	`13779`	`Py_ssize_t size;`
`13780`	`13780`
`13781`	`13781`	`if (!PyUnicode_Check(unicode)) {`
`13782`	`13782`	`PyErr_BadArgument();`
`13783`	`13783`	`return NULL;`
`13784`	`13784`	`}`
	`13785`	`+ u = PyUnicode_AsUnicode(object);`
	`13786`	`+ if (u == NULL)`
	`13787`	`+ return NULL;`
`13785`	`13788`	`/* Ensure we won't overflow the size. */`
`13786`	`13789`	`if (PyUnicode_GET_SIZE(unicode) > ((PY_SSIZE_T_MAX / sizeof(Py_UNICODE)) - 1)) {`
`13787`	`13790`	`PyErr_NoMemory();`
`@@ -13794,7 +13797,7 @@ PyUnicode_AsUnicodeCopy(PyObject *object)`
`13794`	`13797`	`PyErr_NoMemory();`
`13795`	`13798`	`return NULL;`
`13796`	`13799`	`}`
`13797`		`- memcpy(copy, PyUnicode_AS_UNICODE(unicode), size);`
	`13800`	`+ memcpy(copy, u, size);`
`13798`	`13801`	`return copy;`
`13799`	`13802`	`}`
`13800`	`13803`