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

izbyshev · serhiy-storchaka · commit 74a307d48ef8 · 2018-08-19T21:52:04.000+03:00
Reported by Svace static analyzer.
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -6813,8 +6813,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));
@@ -6836,6 +6834,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
`@@ -6813,8 +6813,6 @@ unicode_encode_ucs1(PyObject *unicode,`
`6813`	`6813`	`str = _PyBytesWriter_WriteBytes(&writer, str,`
`6814`	`6814`	`PyBytes_AS_STRING(rep),`
`6815`	`6815`	`PyBytes_GET_SIZE(rep));`
`6816`		`- if (str == NULL)`
`6817`		`- goto onError;`
`6818`	`6816`	`}`
`6819`	`6817`	`else {`
`6820`	`6818`	`assert(PyUnicode_Check(rep));`
`@@ -6836,6 +6834,9 @@ unicode_encode_ucs1(PyObject *unicode,`
`6836`	`6834`	`PyUnicode_DATA(rep),`
`6837`	`6835`	`PyUnicode_GET_LENGTH(rep));`
`6838`	`6836`	`}`
	`6837`	`+ if (str == NULL)`
	`6838`	`+ goto onError;`
	`6839`	`+`
`6839`	`6840`	`pos = newpos;`
`6840`	`6841`	`Py_CLEAR(rep);`
`6841`	`6842`	`}`