From 745dc65b17b3936e3f9f4099f735f174d30c4e0c Mon Sep 17 00:00:00 2001
From: Eddie Elizondo <eduardo.elizondorueda@gmail.com>
Date: Wed, 21 Feb 2018 20:55:18 -0800
Subject: closes bpo-32898: Fix debug build crash with COUNT_ALLOCS (GH-5800)

---
 Misc/ACKS                                                       | 1 +
 Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst | 1 +
 Objects/listobject.c                                            | 2 +-
 Objects/object.c                                                | 3 ++-
 Objects/tupleobject.c                                           | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst

diff --git a/Misc/ACKS b/Misc/ACKS
index b15b20e..2eddc56 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -425,6 +425,7 @@ Tal Einat
 Eric Eisner
 Andrew Eland
 Julien Élie
+Eduardo Elizondo
 Lance Ellinghaus
 Daniel Ellis
 Phil Elson
diff --git a/Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst b/Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst
new file mode 100644
index 0000000..4c75466
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2018-02-21-12-46-00.bpo-32898.M15bZh.rst
@@ -0,0 +1 @@
+Fix the python debug build when using COUNT_ALLOCS.
diff --git a/Objects/listobject.c b/Objects/listobject.c
index f0fe962..c8ffeff 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -86,7 +86,7 @@ static void
 show_alloc(void)
 {
     PyInterpreterState *interp = PyThreadState_GET()->interp;
-    if (!inter->core_config.show_alloc_count) {
+    if (!interp->core_config.show_alloc_count) {
         return;
     }
 
diff --git a/Objects/object.c b/Objects/object.c
index fef57fc..220aa90 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -97,10 +97,11 @@ void
 dump_counts(FILE* f)
 {
     PyInterpreterState *interp = PyThreadState_GET()->interp;
-    if (!inter->core_config.show_alloc_count) {
+    if (!interp->core_config.show_alloc_count) {
         return;
     }
 
+    PyTypeObject *tp;
     for (tp = type_list; tp; tp = tp->tp_next)
         fprintf(f, "%s alloc'd: %" PY_FORMAT_SIZE_T "d, "
             "freed: %" PY_FORMAT_SIZE_T "d, "
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 39d43dd..9bb91a5 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -45,7 +45,7 @@ static void
 show_track(void)
 {
     PyInterpreterState *interp = PyThreadState_GET()->interp;
-    if (!inter->core_config.show_alloc_count) {
+    if (!interp->core_config.show_alloc_count) {
         return;
     }
 
-- 
cgit v0.12