|
 |
cb67f2 |
From 693f81d9b37934fdb3a0b1de6d06cacbecaffb63 Mon Sep 17 00:00:00 2001
|
|
|
cb67f2 |
From: zherczeg <zherczeg@2f5784b3-3f2a-0410-8824-cb99058d5e15>
|
|
|
cb67f2 |
Date: Fri, 18 Jan 2013 08:20:44 +0000
|
|
|
cb67f2 |
Subject: [PATCH] Fix forward search in JIT when link size is 3 or greater.
|
|
|
cb67f2 |
|
|
|
cb67f2 |
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1239 2f5784b3-3f2a-0410-8824-cb99058d5e15
|
|
|
cb67f2 |
|
|
|
cb67f2 |
Petr Pisar: Ported to 8.32.
|
|
|
cb67f2 |
|
|
|
cb67f2 |
diff --git a/pcre_jit_compile.c b/pcre_jit_compile.c
|
|
|
cb67f2 |
index cc9f097..3b83340 100644
|
|
|
cb67f2 |
--- a/pcre_jit_compile.c
|
|
|
cb67f2 |
+++ b/pcre_jit_compile.c
|
|
|
cb67f2 |
@@ -2573,7 +2573,7 @@ DEFINE_COMPILER;
|
|
|
cb67f2 |
struct sljit_label *start;
|
|
|
cb67f2 |
struct sljit_jump *quit;
|
|
|
cb67f2 |
pcre_uint32 chars[MAX_N_CHARS * 2];
|
|
|
cb67f2 |
-pcre_uchar *cc = common->start + 1 + IMM2_SIZE;
|
|
|
cb67f2 |
+pcre_uchar *cc = common->start + 1 + LINK_SIZE;
|
|
|
cb67f2 |
int location = 0;
|
|
|
cb67f2 |
pcre_int32 len, c, bit, caseless;
|
|
|
cb67f2 |
int must_stop;
|
|
|
cb67f2 |
diff --git a/testdata/testinput12 b/testdata/testinput12
|
|
|
cb67f2 |
index 7deba3c..92c9603 100644
|
|
|
cb67f2 |
--- a/testdata/testinput12
|
|
|
cb67f2 |
+++ b/testdata/testinput12
|
|
|
cb67f2 |
@@ -86,4 +86,7 @@ and a couple of things that are different with JIT. --/
|
|
|
cb67f2 |
|
|
|
cb67f2 |
/.?(*THEN)/S!+I
|
|
|
cb67f2 |
|
|
|
cb67f2 |
+/^12345678abcd/mS++
|
|
|
cb67f2 |
+ 12345678abcd
|
|
|
cb67f2 |
+
|
|
|
cb67f2 |
/-- End of testinput12 --/
|
|
|
cb67f2 |
diff --git a/testdata/testoutput12 b/testdata/testoutput12
|
|
|
cb67f2 |
index 559f48d..f3c0230 100644
|
|
|
cb67f2 |
--- a/testdata/testoutput12
|
|
|
cb67f2 |
+++ b/testdata/testoutput12
|
|
|
cb67f2 |
@@ -178,4 +178,8 @@ Subject length lower bound = -1
|
|
|
cb67f2 |
No set of starting bytes
|
|
|
cb67f2 |
JIT study was not successful
|
|
|
cb67f2 |
|
|
|
cb67f2 |
+/^12345678abcd/mS++
|
|
|
cb67f2 |
+ 12345678abcd
|
|
|
cb67f2 |
+ 0: 12345678abcd (JIT)
|
|
|
cb67f2 |
+
|
|
|
cb67f2 |
/-- End of testinput12 --/
|
|
|
cb67f2 |
--
|
|
|
cb67f2 |
1.8.1
|
|
|
cb67f2 |
|