From 016518073537e2b88c8ac3f33f4caebd6bede3c6 Mon Sep 17 00:00:00 2001 From: Andreas Gaeer Date: Mon, 3 Sep 2018 19:52:43 +0100 Subject: [PATCH] Fix assert in PyTuple_GET_SIZE Occurs in debug interpreter builds of python-3.7 when calling tp_new in a few testcases such as Examples/python/extend. Closes #1321 --- CHANGES.current | 4 ++++ Lib/python/pyrun.swg | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) #diff --git a/CHANGES.current b/CHANGES.current #index 22bdfb7ff..67afee72c 100644 #--- a/CHANGES.current #+++ b/CHANGES.current #@@ -7,6 +7,10 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/ # Version 4.0.0 (in progress) # =========================== # #+2018-09-02: andreas.gaeer,tkrasnukha #+ [Python] #1321 Fix assert in PyTuple_GET_SIZE in debug interpreter builds of python-3.7 #+ when calling tp_new. #+ # 2018-09-01: ChristopherHogan # [Guile] #1288 Fix garbage collection for guile >= 2.0.12. # diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg index c3e83dcc9..b1276813d 100644 --- a/Lib/python/pyrun.swg +++ b/Lib/python/pyrun.swg @@ -1359,10 +1359,14 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this) } } else { #if PY_VERSION_HEX >= 0x03000000 - inst = ((PyTypeObject*) data->newargs)->tp_new((PyTypeObject*) data->newargs, Py_None, Py_None); - if (inst) { - PyObject_SetAttr(inst, SWIG_This(), swig_this); - Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; + PyObject *empty_args = PyTuple_New(0); + if (empty_args) { + inst = ((PyTypeObject *)data->newargs)->tp_new((PyTypeObject *)data->newargs, empty_args, Py_None); + Py_DECREF(empty_args); + if (inst) { + PyObject_SetAttr(inst, SWIG_This(), swig_this); + Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; + } } #else PyObject *dict = PyDict_New(); -- 2.21.1