From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 24 Aug 2018 04:49:29 +0000 (-0400)
Subject: closes bpo-34477: Objects/typeobject.c: Add missing NULL check to type_init() (GH... 
X-Git-Tag: v3.6.7rc1~90
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbe359a5e0b22e96065d24d033bebf27cdb374be;p=thirdparty%2FPython%2Fcpython.git

closes bpo-34477: Objects/typeobject.c: Add missing NULL check to type_init() (GH-8876)


Reported by Svace static analyzer.
(cherry picked from commit f6247aac08c1a79d0479145a405718bb76dba434)

Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>
---

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 69b1878fd8f2..bbc383a695b8 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2235,6 +2235,9 @@ type_init(PyObject *cls, PyObject *args, PyObject *kwds)
     /* Call object.__init__(self) now. */
     /* XXX Could call super(type, cls).__init__() but what's the point? */
     args = PyTuple_GetSlice(args, 0, 0);
+    if (args == NULL) {
+        return -1;
+    }
     res = object_init(cls, args, NULL);
     Py_DECREF(args);
     return res;