[Python-checkins] (merge 3.1 -> 3.2): Merge fix for issue #11450

[antoine.pitrou]

http://hg.python.org/cpython/rev/605c74139754
changeset:   68343:605c74139754
branch:      3.2
parent:      68340:e6c45cd46cb2
parent:      68342:0f9e5042907c
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Mar 09 12:47:20 2011 +0100
summary:
  Merge fix for issue #11450

files:
  Misc/NEWS

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when
+  there are many tags (e.g. when using mq).  Patch by Nadeem Vawda.
+
 - Issue #11246: Fix PyUnicode_FromFormat("%V") to decode the byte string from
   UTF-8 (with replace error handler) instead of ISO-8859-1 (in strict mode).
   Patch written by Ray Allen.
diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
--- a/Modules/getbuildinfo.c
+++ b/Modules/getbuildinfo.c
@@ -42,7 +42,9 @@
 const char *
 Py_GetBuildInfo(void)
 {
-    static char buildinfo[50];
+    static char buildinfo[50 + sizeof HGVERSION +
+                          ((sizeof HGTAG > sizeof HGBRANCH) ?
+                           sizeof HGTAG : sizeof HGBRANCH)];
     const char *revision = _Py_hgversion();
     const char *sep = *revision ? ":" : "";
     const char *hgid = _Py_hgidentifier();

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