diff options
Diffstat (limited to 'src/3rdparty/pcre/patches')
-rw-r--r-- | src/3rdparty/pcre/patches/pcre-r1495.patch | 23 | ||||
-rw-r--r-- | src/3rdparty/pcre/patches/pcre-r1498.patch | 45 | ||||
-rw-r--r-- | src/3rdparty/pcre/patches/pcre-r1513.patch | 18 |
3 files changed, 0 insertions, 86 deletions
diff --git a/src/3rdparty/pcre/patches/pcre-r1495.patch b/src/3rdparty/pcre/patches/pcre-r1495.patch deleted file mode 100644 index d8b4ce097a..0000000000 --- a/src/3rdparty/pcre/patches/pcre-r1495.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: pcre_compile.c -=================================================================== ---- pcre_compile.c (revision 1494) -+++ pcre_compile.c (revision 1495) -@@ -8267,12 +8267,16 @@ - - /* If it was a capturing subpattern, check to see if it contained any - recursive back references. If so, we must wrap it in atomic brackets. -- In any event, remove the block from the chain. */ -+ Because we are moving code along, we must ensure that any pending recursive -+ references are updated. In any event, remove the block from the chain. */ - - if (capnumber > 0) - { - if (cd->open_caps->flag) - { -+ *code = OP_END; -+ adjust_recurse(start_bracket, 1 + LINK_SIZE, -+ (options & PCRE_UTF8) != 0, cd, cd->hwm); - memmove(start_bracket + 1 + LINK_SIZE, start_bracket, - IN_UCHARS(code - start_bracket)); - *start_bracket = OP_ONCE; - diff --git a/src/3rdparty/pcre/patches/pcre-r1498.patch b/src/3rdparty/pcre/patches/pcre-r1498.patch deleted file mode 100644 index 8ae48a4336..0000000000 --- a/src/3rdparty/pcre/patches/pcre-r1498.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: pcre_compile.c -=================================================================== ---- pcre_compile.c (revision 1497) -+++ pcre_compile.c (revision 1498) -@@ -2374,6 +2374,7 @@ - if (c == OP_RECURSE) - { - const pcre_uchar *scode = cd->start_code + GET(code, 1); -+ const pcre_uchar *endgroup = scode; - BOOL empty_branch; - - /* Test for forward reference or uncompleted reference. This is disabled -@@ -2388,24 +2389,20 @@ - if (GET(scode, 1) == 0) return TRUE; /* Unclosed */ - } - -- /* If we are scanning a completed pattern, there are no forward references -- and all groups are complete. We need to detect whether this is a recursive -- call, as otherwise there will be an infinite loop. If it is a recursion, -- just skip over it. Simple recursions are easily detected. For mutual -- recursions we keep a chain on the stack. */ -+ /* If the reference is to a completed group, we need to detect whether this -+ is a recursive call, as otherwise there will be an infinite loop. If it is -+ a recursion, just skip over it. Simple recursions are easily detected. For -+ mutual recursions we keep a chain on the stack. */ - -+ do endgroup += GET(endgroup, 1); while (*endgroup == OP_ALT); -+ if (code >= scode && code <= endgroup) continue; /* Simple recursion */ - else -- { -+ { - recurse_check *r = recurses; -- const pcre_uchar *endgroup = scode; -- -- do endgroup += GET(endgroup, 1); while (*endgroup == OP_ALT); -- if (code >= scode && code <= endgroup) continue; /* Simple recursion */ -- - for (r = recurses; r != NULL; r = r->prev) - if (r->group == scode) break; - if (r != NULL) continue; /* Mutual recursion */ -- } -+ } - - /* Completed reference; scan the referenced group, remembering it on the - stack chain to detect mutual recursions. */ diff --git a/src/3rdparty/pcre/patches/pcre-r1513.patch b/src/3rdparty/pcre/patches/pcre-r1513.patch deleted file mode 100644 index d84aa0cc61..0000000000 --- a/src/3rdparty/pcre/patches/pcre-r1513.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: pcre_exec.c -=================================================================== ---- pcre_exec.c (revisione 1512) -+++ pcre_exec.c (revisione 1513) -@@ -1404,8 +1404,11 @@ - condition = TRUE; - - /* Advance ecode past the assertion to the start of the first branch, -- but adjust it so that the general choosing code below works. */ -- -+ but adjust it so that the general choosing code below works. If the -+ assertion has a quantifier that allows zero repeats we must skip over -+ the BRAZERO. This is a lunatic thing to do, but somebody did! */ -+ -+ if (*ecode == OP_BRAZERO) ecode++; - ecode += GET(ecode, 1); - while (*ecode == OP_ALT) ecode += GET(ecode, 1); - ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode]; |