commit 74a307d48ef8b278c4629ca0ef2139be1c9a34e6
author Alexey Izbyshev <izbyshev@users.noreply.github.com> Sun Aug 19 21:52:04 2018 +0300
committer Serhiy Storchaka <storchaka@gmail.com> Sun Aug 19 21:52:04 2018 +0300
tree 31591459ce61fa6d19c77151b63912c9db05e208
parent 225b05548027d55aafb11b65f6a4a2bef2f5196f

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

Reported by Svace static analyzer.

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 0460d18..087cfca 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -6813,8 +6813,6 @@
                     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 @@
                                                     PyUnicode_DATA(rep),
                                                     PyUnicode_GET_LENGTH(rep));
                 }
+                if (str == NULL)
+                    goto onError;
+
                 pos = newpos;
                 Py_CLEAR(rep);
             }