bpo-34435: Add missing NULL check to unicode_encode_ucs1(). (GH-8823)

miss-islington · izbyshev · web-flow · commit 1e596d3a20a1 · 2018-08-19T16:17:53.000-04:00
Reported by Svace static analyzer. (cherry picked from commit 74a307d) Co-authored-by: Alexey Izbyshev <izbyshev@users.noreply.github.com>
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -6812,8 +6812,6 @@ unicode_encode_ucs1(PyObject *unicode,
                     str = _PyBytesWriter_WriteBytes(&writer, str,
                                                     PyBytes_AS_STRING(rep),
                                                     PyBytes_GET_SIZE(rep));
-                    if (str == NULL)
-                        goto onError;
                 }
                 else {
                     assert(PyUnicode_Check(rep));
@@ -6835,6 +6833,9 @@ unicode_encode_ucs1(PyObject *unicode,
                                                     PyUnicode_DATA(rep),
                                                     PyUnicode_GET_LENGTH(rep));
                 }
+                if (str == NULL)
+                    goto onError;
+
                 pos = newpos;
                 Py_CLEAR(rep);
             }

Original file line number	Diff line number	Diff line change
`@@ -6812,8 +6812,6 @@ unicode_encode_ucs1(PyObject *unicode,`
`6812`	`6812`	`str = _PyBytesWriter_WriteBytes(&writer, str,`
`6813`	`6813`	`PyBytes_AS_STRING(rep),`
`6814`	`6814`	`PyBytes_GET_SIZE(rep));`
`6815`		`- if (str == NULL)`
`6816`		`- goto onError;`
`6817`	`6815`	`}`
`6818`	`6816`	`else {`
`6819`	`6817`	`assert(PyUnicode_Check(rep));`
`@@ -6835,6 +6833,9 @@ unicode_encode_ucs1(PyObject *unicode,`
`6835`	`6833`	`PyUnicode_DATA(rep),`
`6836`	`6834`	`PyUnicode_GET_LENGTH(rep));`
`6837`	`6835`	`}`
	`6836`	`+ if (str == NULL)`
	`6837`	`+ goto onError;`
	`6838`	`+`
`6838`	`6839`	`pos = newpos;`
`6839`	`6840`	`Py_CLEAR(rep);`
`6840`	`6841`	`}`