grep: do not enter PCRE2_UTF mode on fixed matching

avar · gitster · commit 870eea81669b · 2019-07-26T13:56:40.000-07:00
As discussed in the last commit partially fix a bug introduced in b65abca ("grep: use PCRE v2 for optimized fixed-string search", 2019-07-01). Because PCRE v2, unlike kwset, validates its UTF-8 input we'd die on e.g.: fatal: pcre2_match failed with error code -22: UTF-8 error: isolated byte with 0x80 bit set When grepping a non-ASCII fixed string. This is a more general problem that's hard to fix, but we can at least fix the most common case of grepping for a fixed string without "-i". I can't think of a reason for why we'd turn on PCRE2_UTF when matching byte-for-byte like that. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/grep.c b/grep.c
@@ -472,7 +472,8 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
 		}
 		options |= PCRE2_CASELESS;
 	}
-	if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern))
+	if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern) &&
+	    !(!opt->ignore_case && (p->fixed || p->is_fixed)))
 		options |= PCRE2_UTF;
 
 	p->pcre2_pattern = pcre2_compile((PCRE2_SPTR)p->pattern,
diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh
@@ -68,9 +68,9 @@ test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UT
 '
 
 test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data' '
-	test_might_fail git grep -h "æ" invalid-0x80 >actual &&
+	git grep -h "æ" invalid-0x80 >actual &&
 	test_cmp expected actual &&
-	test_must_fail git grep -h "(*NO_JIT)æ" invalid-0x80 &&
+	git grep -h "(*NO_JIT)æ" invalid-0x80 &&
 	test_cmp expected actual
 '
 

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,8 @@ static void compile_pcre2_pattern(struct grep_pat p, const struct grep_opt opt`
`472`	`472`	`}`
`473`	`473`	`options \|= PCRE2_CASELESS;`
`474`	`474`	`}`
`475`		`- if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern))`
	`475`	`+ if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern) &&`
	`476`	`+ !(!opt->ignore_case && (p->fixed \|\| p->is_fixed)))`
`476`	`477`	`options \|= PCRE2_UTF;`
`477`	`478`
`478`	`479`	`p->pcre2_pattern = pcre2_compile((PCRE2_SPTR)p->pattern,`
Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,9 @@ test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UT`
`68`	`68`	`'`
`69`	`69`
`70`	`70`	`test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data' '`
`71`		`- test_might_fail git grep -h "æ" invalid-0x80 >actual &&`
	`71`	`+ git grep -h "æ" invalid-0x80 >actual &&`
`72`	`72`	`test_cmp expected actual &&`
`73`		`- test_must_fail git grep -h "(*NO_JIT)æ" invalid-0x80 &&`
	`73`	`+ git grep -h "(*NO_JIT)æ" invalid-0x80 &&`
`74`	`74`	`test_cmp expected actual`
`75`	`75`	`'`
`76`	`76`