global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-08 00:07:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: detect broken iconv that requires ICONV_RESTART_RESET

Browse Source 
In d0cec08d70 (utf8.c: prepare workaround for iconv under macOS 14/15,
2026-01-12) we have introduced a new workaround for a broken version of
libiconv on macOS. This workaround has for now only been wired up for
our Makefile, so using Meson with such a broken version will fail.

We can rather easily detect the broken behaviour. Some encodings have
different modes that can be switched to via an escape sequence. In the
case of ISO-2022-JP this can be done via "<Esc>$B" and "<Esc>(J" to
switch between ASCII and JIS modes. The bug now triggers when one does
multiple calls to iconv(3p) to convert a string piece by piece, where
the first call enters JIS mode. The second call forgets about the fact
that it is still in JIS mode, and consequently it will incorrectly treat
the input as ASCII, and thus the produced output is of course garbage.

Wire up a test that exercises this in Meson and, if it fails, set the
`ICONV_RESTART_RESET` define.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2026-03-05 12:20:22 +01:00
committed by Junio C Hamano
parent 4cae584769
commit f1d734bf25
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
meson.build
View File

@@ -1053,6 +1053,32 @@ if iconv.found()
).returncode() != 0
libgit_c_args += '-DICONV_OMITS_BOM'
endif
if compiler.run('''
#include <iconv.h>
#include <string.h>
int main(int argc, const char *argv[])
{
char in[] = "\x1b\x24\x42\x24\x22\x24\x22\x1b\x28\x42", *inpos = in;
char out[7] = { 0 }, *outpos = out;
size_t insz = sizeof(in) - 1, outsz = 4;
iconv_t conv = iconv_open("UTF-8", "ISO-2022-JP");
if (!conv)
return 1;
if (iconv(conv, (void *) &inpos, &insz, &outpos, &outsz) != (size_t) -1)
return 2;
outsz = sizeof(out) - (outpos - out);
if (iconv(conv, (void *) &inpos, &insz, &outpos, &outsz) == (size_t) -1)
return 3;
return strcmp("\343\201\202\343\201\202", out) ? 4 : 0;
}
''',
dependencies: iconv,
name: 'iconv handles restarts properly',
).returncode() != 0
libgit_c_args += '-DICONV_RESTART_RESET'
endif
endif
else
libgit_c_args += '-DNO_ICONV'