From e77cdae0f84fc390fed5555ea1f53bbc8746d634 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sun, 19 Aug 2018 16:19:18 -0400 Subject: bpo-34435: Add missing NULL check to unicode_encode_ucs1(). (GH-8823) Reported by Svace static analyzer. (cherry picked from commit 74a307d48ef8b278c4629ca0ef2139be1c9a34e6) Co-authored-by: Alexey Izbyshev --- Objects/unicodeobject.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index bed7d41..972423e 100644 --- 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); } -- cgit v0.12