46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
|
From 75e399f77b5ffd82194b461e837a32cf48a5d970 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zherczeg <zherczeg@6239d852-aaf2-0410-a92c-79f79f948069>
|
||
|
|
Date: Sat, 7 Dec 2019 16:00:53 +0000
|
||
|
|
Subject: [PATCH] Fix the too early access of the fields of a compiled pattern
|
||
|
|
in JIT.
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1192 6239d852-aaf2-0410-a92c-79f79f948069
|
||
|
|
Petr Písař: Ported to 10.34.
|
||
|
|
---
|
||
|
|
src/pcre2_jit_compile.c | 10 +++++-----
|
||
|
|
|
||
|
|
diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
|
||
|
|
index 1d64536..303c68f 100644
|
||
|
|
--- a/src/pcre2_jit_compile.c
|
||
|
|
+++ b/src/pcre2_jit_compile.c
|
||
|
|
@@ -13742,11 +13742,6 @@ pcre2_jit_compile(pcre2_code *code, uint32_t options)
|
||
|
|
{
|
||
|
|
pcre2_real_code *re = (pcre2_real_code *)code;
|
||
|
|
|
||
|
|
-#ifdef SUPPORT_JIT
|
||
|
|
-executable_functions *functions = (executable_functions *)re->executable_jit;
|
||
|
|
-static int executable_allocator_is_working = 0;
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
if (code == NULL)
|
||
|
|
return PCRE2_ERROR_NULL;
|
||
|
|
|
||
|
|
@@ -13779,6 +13774,11 @@ actions are needed:
|
||
|
|
avoid compiler warnings.
|
||
|
|
*/
|
||
|
|
|
||
|
|
+#ifdef SUPPORT_JIT
|
||
|
|
+executable_functions *functions = (executable_functions *)re->executable_jit;
|
||
|
|
+static int executable_allocator_is_working = 0;
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
if ((options & PCRE2_JIT_INVALID_UTF) != 0)
|
||
|
|
{
|
||
|
|
if ((re->overall_options & PCRE2_MATCH_INVALID_UTF) == 0)
|
||
|
|
--
|
||
|
|
2.21.0
|
||
|
|
|