[Python-checkins] cpython (3.3): Issue #18942: sys._debugmallocstats() output was damaged on Windows.

[tim.peters]

http://hg.python.org/cpython/rev/d95cc29ea94e
changeset:   85555:d95cc29ea94e
branch:      3.3
parent:      85553:34e515f2fdfe
user:        Tim Peters <tim at python.org>
date:        Thu Sep 05 22:57:04 2013 -0500
summary:
  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".

files:
  Misc/NEWS          |  2 ++
  Objects/obmalloc.c |  2 +-
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@
 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
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1761,7 +1761,7 @@
     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);

-- 
Repository URL: http://hg.python.org/cpython