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

Reported by Svace static analyzer.

bpo-34435: Add missing NULL check to unicode_encode_ucs1(). (GH-8823)
Reported by Svace static analyzer.
74a307d4 · Alexey Izbyshev · Serhiy Storchaka · 225b0554 · 74a307d4
Commit 74a307d4 authored Aug 19, 2018 by Alexey Izbyshev Committed by Serhiy Storchaka Aug 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Objects/unicodeobject.c Objects/unicodeobject.c +3 -2

No files found.
--- 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);
            }