From 1b95f98f9538a114c50d6531f09c98979f1d5a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Herczeg?= Date: Thu, 14 Feb 2019 07:33:57 +0000 Subject: [PATCH] Compile invalid UTF check in JIT test when only pcre32 is enabled. --- ChangeLog | 2 ++ src/pcre2_jit_test.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 990a6a3..a3c81a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,8 @@ construct. 32. Compile \p{Any} to be the same as . in DOTALL mode, so that it benefits from auto-anchoring if \p{Any}* starts a pattern. +33. Compile invalid UTF check in JIT test when only pcre32 is enabled. + Version 10.32 10-September-2018 ------------------------------- diff --git a/src/pcre2_jit_test.c b/src/pcre2_jit_test.c index 2115c3f..fa14329 100644 --- a/src/pcre2_jit_test.c +++ b/src/pcre2_jit_test.c @@ -868,8 +868,8 @@ static struct regression_test_case regression_test_cases[] = { { MU, A, 0, 0, "(a(*COMMIT)(?:b|bb)|c(*ACCEPT)d|dd){0}_(?1)+_", "_ax_ _cd_ _abbb_ _abcd_ _abbcdd_" }, { MU, A, 0, 0, "((.)(?:.|(*COMMIT)\\2{3}(*ACCEPT).*|.*)){0}_(?1){0,4}_", "_aaaabbbbccccddd_ _aaaabbbbccccdddd_" }, +#ifdef SUPPORT_UNICODE /* Script runs and iterations. */ -#ifdef SUPPORT_UNICODE { MU, A, 0, 0, "!(*sr:\\w\\w|\\w\\w\\w)*#", "!abcdefghijklmno!abcdefghijklmno!abcdef#" }, { MU, A, 0, 0, "!(*sr:\\w\\w|\\w\\w\\w)+#", "!abcdefghijklmno!abcdefghijklmno!abcdef#" }, { MU, A, 0, 0, "!(*sr:\\w\\w|\\w\\w\\w)*?#", "!abcdefghijklmno!abcdefghijklmno!abcdef#" }, @@ -1770,7 +1770,7 @@ static int regression_tests(void) } } -#if defined SUPPORT_UNICODE && (defined SUPPORT_PCRE2_8 || defined SUPPORT_PCRE2_16) +#if defined SUPPORT_UNICODE && (defined SUPPORT_PCRE2_8 || defined SUPPORT_PCRE2_16 || defined SUPPORT_PCRE2_32) static int check_invalid_utf_result(int pattern_index, const char *type, int result, int match_start, int match_end, PCRE2_SIZE *ovector) @@ -1803,7 +1803,7 @@ static int check_invalid_utf_result(int pattern_index, const char *type, int res return 0; } -#endif /* SUPPORT_UNICODE && (SUPPORT_PCRE2_8 || SUPPORT_PCRE2_16) */ +#endif /* SUPPORT_UNICODE && (SUPPORT_PCRE2_8 || SUPPORT_PCRE2_16 || SUPPORT_PCRE2_32) */ #if defined SUPPORT_UNICODE && defined SUPPORT_PCRE2_8