bpo-31095: fix potential crash during GCbpo-31095

Original patch by INADA Naoki.

1 files changed, 4 insertions, 2 deletions

diff --git a/simplejson/_speedups.c b/simplejson/_speedups.c
index 7b46d8a..ed8e611 100644
--- a/simplejson/_speedups.c
+++ b/simplejson/_speedups.c
@@ -1355,7 +1355,8 @@ py_encode_basestring_ascii(PyObject* self UNUSED, PyObject *pystr)
 static void
 scanner_dealloc(PyObject *self)
 {
-    /* Deallocate scanner object */
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(self);
     scanner_clear(self);
     Py_TYPE(self)->tp_free(self);
 }
@@ -3205,7 +3206,8 @@ bail:
 static void
 encoder_dealloc(PyObject *self)
 {
-    /* Deallocate Encoder */
+    /* bpo-31095: UnTrack is needed before calling any callbacks */
+    PyObject_GC_UnTrack(self);
     encoder_clear(self);
     Py_TYPE(self)->tp_free(self);
 }