bpo-31095: fix potential crash during GC (#187)

Original patch by INADA Naoki.
simplejson · Nov 6, 2017 · 138a2ff · 138a2ff
1 parent 113039a
commit 138a2ff
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/simplejson/_speedups.c b/simplejson/_speedups.c
@@ -1358,7 +1358,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);
 }
@@ -3208,7 +3209,8 @@ encoder_listencode_list(PyEncoderObject *s, JSON_Accu *rval, PyObject *seq, Py_s
 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);
 }