commit f8bf286a6e26bfcefebe99815a03acbd7176e90d
author Andrew Rogers <andrew.rogers@wdc.com> Tue Nov 27 23:36:26 2018 +0000
committer William S Fulton <wsf@fultondesigns.co.uk> Tue Dec 11 07:54:57 2018 +0000
tree d4a1e740eca91fd8dcab6c8c68342e6c3626b924
parent 67f5ade7ad03f15a2811190df899196dbf5a12fe

#1368: AV in tp_print caused by mismatched Python/extension CRT usage

Lib/python/pyinit.swg

diff --git a/Lib/python/pyinit.swg b/Lib/python/pyinit.swg
index 6a0e08a..1c426e6 100644
--- a/Lib/python/pyinit.swg
+++ b/Lib/python/pyinit.swg
@@ -155,7 +155,7 @@
       sizeof(swig_varlinkobject),         /* tp_basicsize */
       0,                                  /* tp_itemsize */
       (destructor) swig_varlink_dealloc,  /* tp_dealloc */
-      (printfunc) swig_varlink_print,     /* tp_print */
+      0,                                  /* tp_print */
       (getattrfunc) swig_varlink_getattr, /* tp_getattr */
       (setattrfunc) swig_varlink_setattr, /* tp_setattr */
       0,                                  /* tp_compare */

Lib/python/pyrun.swg

diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg
index 7386ff7..53b9525 100644
--- a/Lib/python/pyrun.swg
+++ b/Lib/python/pyrun.swg
@@ -822,7 +822,7 @@
       sizeof(SwigPyPacked),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyPacked_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyPacked_print,        /* tp_print */
+      0,                                    /* tp_print */
       (getattrfunc)0,                       /* tp_getattr */
       (setattrfunc)0,                       /* tp_setattr */
 #if PY_VERSION_HEX>=0x03000000

Source/Modules/python.cxx

diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 8764fd9..a595a83 100755
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -4013,7 +4013,7 @@
     printSlot(f, getSlot(n, "feature:python:tp_basicsize", tp_basicsize), "tp_basicsize");
     printSlot(f, getSlot(n, "feature:python:tp_itemsize"), "tp_itemsize");
     printSlot(f, getSlot(n, "feature:python:tp_dealloc", tp_dealloc_bad), "tp_dealloc", "destructor");
-    printSlot(f, getSlot(n, "feature:python:tp_print"), "tp_print", "printfunc");
+    Printv(f, "    0,                                    /* tp_print */\n");
     printSlot(f, getSlot(n, "feature:python:tp_getattr"), "tp_getattr", "getattrfunc");
     printSlot(f, getSlot(n, "feature:python:tp_setattr"), "tp_setattr", "setattrfunc");
     Printv(f, "#if PY_VERSION_HEX >= 0x03000000\n", NIL);