mirror of
https://github.com/git/git
synced 2024-10-30 03:13:24 +00:00
dc2c44fbb1
compile_pcre2_pattern() currently uses the option PCRE2_UTF only for
patterns with non-ASCII characters. Patterns with ASCII wildcards can
match non-ASCII strings, though. Without that option PCRE2 mishandles
UTF-8 input, though -- it matches parts of multi-byte characters. Fix
that by using PCRE2_UTF even for ASCII-only patterns.
This is a remake of the reverted ae39ba431a (grep/pcre2: fix an edge
case concerning ascii patterns and UTF-8 data, 2021-10-15). The change
to the condition and the test are simplified and more targeted.
Original-patch-by: Hamza Mahfooz <someguy@effective-light.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
132 lines
4.3 KiB
Bash
Executable file
132 lines
4.3 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_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-literal ASCII from UTF-8' '
|
|
git grep --perl-regexp -h -o -e ll. file >actual &&
|
|
echo "lló" >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|