From: Tim Peters <tim@python.org>
Date: Fri, 6 Sep 2013 03:57:04 +0000 (-0500)
Subject: Issue #18942: sys._debugmallocstats() output was damaged on Windows.
X-Git-Tag: v3.4.0a2~21^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eaa3bcc370cffe080e637fc1af592add9ff59793;p=thirdparty%2FPython%2Fcpython.git

Issue #18942: sys._debugmallocstats() output was damaged on Windows.

_PyDebugAllocatorStats() called PyOS_snprintf() with a %zd format
code, but MS doesn't support that code.  Interpolated
PY_FORMAT_SIZE_T in place of the "z".
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 5439b74b0935..8052c6b6b72e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.3.3 release candidate 1?
 Core and Builtins
 -----------------
 
+- Issue #18942: sys._debugmallocstats() output was damaged on Windows.
+
 - Issue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions.
 
 - Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 50fc7c155d46..c261b689beb6 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1761,7 +1761,7 @@ _PyDebugAllocatorStats(FILE *out,
     char buf1[128];
     char buf2[128];
     PyOS_snprintf(buf1, sizeof(buf1),
-                  "%d %ss * %zd bytes each",
+                  "%d %ss * %" PY_FORMAT_SIZE_T "d bytes each",
                   num_blocks, block_name, sizeof_block);
     PyOS_snprintf(buf2, sizeof(buf2),
                   "%48s ", buf1);