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

miss-islington · izbyshev · web-flow · commit e77cdae0f84f · 2018-08-19T16:19:18.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
@@ -6903,8 +6903,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));
@@ -6940,6 +6938,9 @@ unicode_encode_ucs1(PyObject *unicode,
                         }
                     }
                 }
+                if (str == NULL)
+                    goto onError;
+
                 pos = newpos;
                 Py_CLEAR(rep);
             }

Original file line number	Diff line number	Diff line change
`@@ -6903,8 +6903,6 @@ unicode_encode_ucs1(PyObject *unicode,`
`6903`	`6903`	`str = _PyBytesWriter_WriteBytes(&writer, str,`
`6904`	`6904`	`PyBytes_AS_STRING(rep),`
`6905`	`6905`	`PyBytes_GET_SIZE(rep));`
`6906`		`- if (str == NULL)`
`6907`		`- goto onError;`
`6908`	`6906`	`}`
`6909`	`6907`	`else {`
`6910`	`6908`	`assert(PyUnicode_Check(rep));`
`@@ -6940,6 +6938,9 @@ unicode_encode_ucs1(PyObject *unicode,`
`6940`	`6938`	`}`
`6941`	`6939`	`}`
`6942`	`6940`	`}`
	`6941`	`+ if (str == NULL)`
	`6942`	`+ goto onError;`
	`6943`	`+`
`6943`	`6944`	`pos = newpos;`
`6944`	`6945`	`Py_CLEAR(rep);`
`6945`	`6946`	`}`