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

antoine.pitrou python-checkins at python.org
Wed Mar 9 12:54:13 CET 2011


http://hg.python.org/cpython/rev/1e00b161f5f5
changeset:   68344:1e00b161f5f5
parent:      68341:ec717db610df
parent:      68343:605c74139754
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Mar 09 12:53:30 2011 +0100
summary:
  Merge fix for issue #11450

files:
  Misc/NEWS
  Modules/getbuildinfo.c

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 #11335: Fixed a memory leak in list.sort when the key function
   throws an exception.
 
diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
--- a/Modules/getbuildinfo.c
+++ b/Modules/getbuildinfo.c
@@ -34,7 +34,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


More information about the Python-checkins mailing list