[Pcre-svn] [1073] code/trunk: Compile invalid UTF check in J…

Page principale
Supprimer ce message
Auteur: Subversion repository
Date:  
À: pcre-svn
Sujet: [Pcre-svn] [1073] code/trunk: Compile invalid UTF check in JIT test when only pcre32 is enabled.
Revision: 1073
          http://www.exim.org/viewvc/pcre2?view=rev&revision=1073
Author:   zherczeg
Date:     2019-02-14 07:33:57 +0000 (Thu, 14 Feb 2019)
Log Message:
-----------
Compile invalid UTF check in JIT test when only pcre32 is enabled.


Modified Paths:
--------------
    code/trunk/ChangeLog
    code/trunk/src/pcre2_jit_test.c


Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2019-02-13 17:30:24 UTC (rev 1072)
+++ code/trunk/ChangeLog    2019-02-14 07:33:57 UTC (rev 1073)
@@ -131,7 +131,9 @@
 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
-------------------------------


Modified: code/trunk/src/pcre2_jit_test.c
===================================================================
--- code/trunk/src/pcre2_jit_test.c    2019-02-13 17:30:24 UTC (rev 1072)
+++ code/trunk/src/pcre2_jit_test.c    2019-02-14 07:33:57 UTC (rev 1073)
@@ -868,8 +868,8 @@
     { 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 @@
     }
 }


-#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 @@
     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