diff options
Diffstat (limited to 'src/3rdparty/pcre')
| -rw-r--r-- | src/3rdparty/pcre/patches/bug_1423_jit_condition_misoptimization_fix.diff | 15 | ||||
| -rw-r--r-- | src/3rdparty/pcre/pcre_jit_compile.c | 4 |
2 files changed, 18 insertions, 1 deletions
diff --git a/src/3rdparty/pcre/patches/bug_1423_jit_condition_misoptimization_fix.diff b/src/3rdparty/pcre/patches/bug_1423_jit_condition_misoptimization_fix.diff new file mode 100644 index 0000000000..4fd46d57a1 --- /dev/null +++ b/src/3rdparty/pcre/patches/bug_1423_jit_condition_misoptimization_fix.diff @@ -0,0 +1,15 @@ +Index: pcre_jit_compile.c +=================================================================== +--- pcre_jit_compile.c (revision 1413) ++++ pcre_jit_compile.c (working copy) +@@ -3546,7 +3546,9 @@ + } + return TRUE; + } +- if ((ranges[3] - ranges[2]) == (ranges[5] - ranges[4]) && is_powerof2(ranges[4] - ranges[2])) ++ if ((ranges[3] - ranges[2]) == (ranges[5] - ranges[4]) ++ && (ranges[2] | (ranges[4] - ranges[2])) == ranges[4] ++ && is_powerof2(ranges[4] - ranges[2])) + { + if (readch) + read_char(common); diff --git a/src/3rdparty/pcre/pcre_jit_compile.c b/src/3rdparty/pcre/pcre_jit_compile.c index 449e55d4b1..a318708b46 100644 --- a/src/3rdparty/pcre/pcre_jit_compile.c +++ b/src/3rdparty/pcre/pcre_jit_compile.c @@ -3546,7 +3546,9 @@ switch(ranges[0]) } return TRUE; } - if ((ranges[3] - ranges[2]) == (ranges[5] - ranges[4]) && is_powerof2(ranges[4] - ranges[2])) + if ((ranges[3] - ranges[2]) == (ranges[5] - ranges[4]) + && (ranges[2] | (ranges[4] - ranges[2])) == ranges[4] + && is_powerof2(ranges[4] - ranges[2])) { if (readch) read_char(common); |