diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-03-09 11:47:20 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-03-09 11:47:20 (GMT) |
| commit | 35db8a80c19aef7418ed4e1572b962cba6577625 (patch) | |
| tree | f658770b73f8f513592ac51e4d0b671265e468be | |
| parent | 2d12f96658db7f1257ac8e15908ce0a8ac96f735 (diff) | |
| parent | 7983d33f543685564ba6b900e162a9aaadb2ea82 (diff) | |
| download | cpython-35db8a80c19aef7418ed4e1572b962cba6577625.zip cpython-35db8a80c19aef7418ed4e1572b962cba6577625.tar.gz cpython-35db8a80c19aef7418ed4e1572b962cba6577625.tar.bz2 | |
Merge fix for issue #11450
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/getbuildinfo.c | 4 |
2 files changed, 6 insertions, 1 deletions
@@ -10,6 +10,9 @@ What's New in Python 3.2.1? 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 index c70126d..ac51881 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(); |