commit a971a6fdb111bb62911ccf45aa9fe734e2e7a590
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Thu Jun 07 17:44:09 2018 -0700
committer Yury Selivanov <yury@magic.io> Thu Jun 07 20:44:09 2018 -0400
tree 45ee08bebe535b0f256af1c4ae3945357d578878
parent 9b0d4d04a15a97a1055f1b729f14e9257f149fd3

bpo-33803: Fix a crash in hamt.c (GH-7504) (GH-7505)

(cherry picked from commit 378c53cc3187dba57c7560ccc2557f516c8a7bc8)

Co-authored-by: Yury Selivanov <yury@magic.io>

Misc/NEWS.d/next/Core and Builtins/2018-06-07-20-18-38.bpo-33803.n-Nq6_.rst

diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-06-07-20-18-38.bpo-33803.n-Nq6_.rst b/Misc/NEWS.d/next/Core and Builtins/2018-06-07-20-18-38.bpo-33803.n-Nq6_.rst
new file mode 100644
index 0000000..9cb8457
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2018-06-07-20-18-38.bpo-33803.n-Nq6_.rst
@@ -0,0 +1,2 @@
+Fix a crash in hamt.c caused by enabling GC tracking for an object that
+hadn't all of its fields set to NULL.

Python/hamt.c

diff --git a/Python/hamt.c b/Python/hamt.c
index 5217122..f8bce59 100644
--- a/Python/hamt.c
+++ b/Python/hamt.c
@@ -2476,6 +2476,8 @@
     if (o == NULL) {
         return NULL;
     }
+    o->h_count = 0;
+    o->h_root = NULL;
     o->h_weakreflist = NULL;
     PyObject_GC_Track(o);
     return o;