95ca1f987e
Improve the support for invalid UTF-8 haystacks given a non-ASCII needle when using the PCREv2 backend. This is a more complete fix for a bug I started to fix in870eea8166(grep: do not enter PCRE2_UTF mode on fixed matching, 2019-07-26), now that PCREv2 has the PCRE2_MATCH_INVALID_UTF mode we can make use of it. This fixes the sort of case described in8a5999838e(grep: stess test PCRE v2 on invalid UTF-8 data, 2019-07-26), i.e.: - The subject string is non-ASCII (e.g. "ævar") - We're under a is_utf8_locale(), e.g. "en_US.UTF-8", not "C" - We are using --ignore-case, or we're a non-fixed pattern If those conditions were satisfied and we matched found non-valid UTF-8 data PCREv2 might bark on it, in practice this only happened under the JIT backend (turned on by default on most platforms). Ultimately this fixes a "regression" inb65abcafc7("grep: use PCRE v2 for optimized fixed-string search", 2019-07-01), I'm putting that in scare-quotes because before then we wouldn't properly support these complex case-folding, locale etc. cases either, it just broke in different ways. There was a bug related to this the PCRE2_NO_START_OPTIMIZE flag fixed in PCREv2 10.36. It can be worked around by setting the PCRE2_NO_START_OPTIMIZE flag. Let's do that in those cases, and add tests for the bug. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
127 lines
4.1 KiB
Bash
Executable File
127 lines
4.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='grep icase on non-English locales'
|
|
|
|
. ./lib-gettext.sh
|
|
|
|
test_expect_success GETTEXT_LOCALE 'setup' '
|
|
test_write_lines "TILRAUN: Halló Heimur!" >file &&
|
|
git add file &&
|
|
LC_ALL="$is_IS_locale" &&
|
|
export LC_ALL
|
|
'
|
|
|
|
test_have_prereq GETTEXT_LOCALE &&
|
|
test-tool regex "HALLÓ" "Halló" ICASE &&
|
|
test_set_prereq REGEX_LOCALE
|
|
|
|
test_expect_success REGEX_LOCALE 'grep literal string, no -F' '
|
|
git grep -i "TILRAUN: Halló Heimur!" &&
|
|
git grep -i "TILRAUN: HALLÓ HEIMUR!"
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,PCRE 'grep pcre utf-8 icase' '
|
|
git grep --perl-regexp "TILRAUN: H.lló Heimur!" &&
|
|
git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
|
|
git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,PCRE 'grep pcre utf-8 string with "+"' '
|
|
test_write_lines "TILRAUN: Hallóó Heimur!" >file2 &&
|
|
git add file2 &&
|
|
git grep -l --perl-regexp "TILRAUN: H.lló+ Heimur!" >actual &&
|
|
echo file >expected &&
|
|
echo file2 >>expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success REGEX_LOCALE 'grep literal string, with -F' '
|
|
git grep -i -F "TILRAUN: Halló Heimur!" &&
|
|
git grep -i -F "TILRAUN: HALLÓ HEIMUR!"
|
|
'
|
|
|
|
test_expect_success REGEX_LOCALE 'grep string with regex, with -F' '
|
|
test_write_lines "TILRAUN: Halló Heimur [abc]!" >file3 &&
|
|
git add file3 &&
|
|
git grep -i -F "TILRAUN: Halló Heimur [abc]!" file3
|
|
'
|
|
|
|
test_expect_success REGEX_LOCALE 'pickaxe -i on non-ascii' '
|
|
git commit -m first &&
|
|
git log --format=%f -i -S"TILRAUN: HALLÓ HEIMUR!" >actual &&
|
|
echo first >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: setup invalid UTF-8 data' '
|
|
printf "\\200\\n" >invalid-0x80 &&
|
|
echo "ævar" >expected &&
|
|
cat expected >>invalid-0x80 &&
|
|
git add invalid-0x80 &&
|
|
|
|
# Test for PCRE2_MATCH_INVALID_UTF bug
|
|
# https://bugs.exim.org/show_bug.cgi?id=2642
|
|
printf "\\345Aæ\\n" >invalid-0xe5 &&
|
|
git add invalid-0xe5
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UTF-8 data' '
|
|
git grep -h "var" invalid-0x80 >actual &&
|
|
test_cmp expected actual &&
|
|
git grep -h "(*NO_JIT)var" invalid-0x80 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UTF-8 data (PCRE2 bug #2642)' '
|
|
git grep -h "Aæ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual &&
|
|
git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data' '
|
|
git grep -h "æ" invalid-0x80 >actual &&
|
|
test_cmp expected actual &&
|
|
git grep -h "(*NO_JIT)æ" invalid-0x80 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data (PCRE2 bug #2642)' '
|
|
git grep -h "Aæ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual &&
|
|
git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual
|
|
'
|
|
|
|
test_lazy_prereq PCRE2_MATCH_INVALID_UTF '
|
|
test-tool pcre2-config has-PCRE2_MATCH_INVALID_UTF
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' '
|
|
test_might_fail git grep -hi "Æ" invalid-0x80 >actual &&
|
|
test_might_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2,PCRE2_MATCH_INVALID_UTF 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' '
|
|
git grep -hi "Æ" invalid-0x80 >actual &&
|
|
test_cmp expected actual &&
|
|
git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE2,PCRE2_MATCH_INVALID_UTF 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i (PCRE2 bug #2642)' '
|
|
git grep -hi "Æ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual &&
|
|
git grep -hi "(*NO_JIT)Æ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual &&
|
|
|
|
# Only the case of grepping the ASCII part in a way that
|
|
# relies on -i fails
|
|
git grep -hi "aÆ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual &&
|
|
git grep -hi "(*NO_JIT)aÆ" invalid-0xe5 >actual &&
|
|
test_cmp invalid-0xe5 actual
|
|
'
|
|
|
|
test_done
|