From: Petr Viktorin <encukou@gmail.com>
Date: Wed, 29 May 2019 03:35:33 +0000 (+0200)
Subject: [3.7] Fix a possible crash due to PyType_FromSpecWithBases() (GH-10304) (GH-13495)
X-Git-Tag: v3.7.4rc1~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3708316afa061dc6c1c6a1207f4998974cfa0752;p=thirdparty%2FPython%2Fcpython.git

[3.7] Fix a possible crash due to PyType_FromSpecWithBases() (GH-10304) (GH-13495)

If the PyObject_MALLOC() call failed in PyType_FromSpecWithBases(),
PyObject_Free() would be called on a static string in type_dealloc().
(cherry picked from commit 0613c1e481440aa8f54ba7f6056924c175fbcc13)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
---

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 3092e98f6b25..7065ee518e5c 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2960,6 +2960,7 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
             size_t len = strlen(old_doc)+1;
             char *tp_doc = PyObject_MALLOC(len);
             if (tp_doc == NULL) {
+                type->tp_doc = NULL;
                 PyErr_NoMemory();
                 goto fail;
             }