summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-03-09 12:34:41 +0100
committerAntoine Pitrou <solipsis@pitrou.net>2011-03-09 12:34:41 +0100
commit7983d33f543685564ba6b900e162a9aaadb2ea82 (patch)
tree14f0a168cf8900a8d85e4b8cfcd81d8d8303da62
parentd2853180dfd905d07aa07d6f95cc4736d5363f22 (diff)
downloadcpython-git-7983d33f543685564ba6b900e162a9aaadb2ea82.tar.gz
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.
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/getbuildinfo.c4
2 files changed, 6 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c4a271baf5..b3d099b2cb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.1.4?
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 #10451: memoryview objects could allow to mutate a readable buffer.
Initial patch by Ross Lagerwall.
diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
index c70126d584..ac5188126c 100644
--- 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();