gettext.c: detect the vsnprintf bug at runtime
Bug 6530 [1] in glibc causes "git show v0.99.6~1" to fail with error "your vsnprintf is broken". The workaround avoids that, but it corrupts system error messages in non-C locales. The bug has been fixed since 2.17. We could know running glibc version with gnu_get_libc_version(). But version is not a sure way to detect the bug because downstream may back port the fix to older versions. Do a runtime test that immitates the call flow that leads to "your vsnprintf is broken". Only enable the workaround if the test fails. Tested on Gentoo Linux, glibc 2.16.0 and 2.17, amd64. [1] http://sourceware.org/bugzilla/show_bug.cgi?id=6530 Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Dec 1, 2013 at 09:45 UTC
9c0495d23e6999375976ca44e3812fc65b73626e
1 file changed
+15
-4
gettext.c
+15
-4
@@ -29,6 +29,17 @@ int use_gettext_poison(void)
29
#endif
30
31
#ifndef NO_GETTEXT
32
+static int test_vsnprintf(const char *fmt, ...)
33
+{
34
+ char buf[26];
35
+ int ret;
36
+ va_list ap;
37
+ va_start(ap, fmt);
38
+ ret = vsnprintf(buf, sizeof(buf), fmt, ap);
39
+ va_end(ap);
40
+ return ret;
41
+}
42
+
43
static const char *charset;
44
static void init_gettext_charset(const char *domain)
45
{
@@ -99,9 +110,7 @@ static void init_gettext_charset(const char *domain)
110
$ LANGUAGE= LANG=de_DE.utf8 ./test
111
test: Kein passendes Ger?t gefunden
112
102
- In the long term we should probably see about getting that
103
- vsnprintf bug in glibc fixed, and audit our code so it won't
104
- fall apart under a non-C locale.
113
+ The vsnprintf bug has been fixed since glibc 2.17.
114
115
Then we could simply set LC_CTYPE from the environment, which would
116
make things like the external perror(3) messages work.
@@ -115,7 +124,9 @@ static void init_gettext_charset(const char *domain)
124
setlocale(LC_CTYPE, "");
125
charset = locale_charset();
126
bind_textdomain_codeset(domain, charset);
118
- setlocale(LC_CTYPE, "C");
127
+ /* the string is taken from v0.99.6~1 */
128
+ if (test_vsnprintf("%.*s", 13, "David_K\345gedal") < 0)
129
+ setlocale(LC_CTYPE, "C");
130
}
131
132
void git_setup_gettext(void)