feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Regex: When matching an (*ACCEPT) and skipping forwards, we have to be careful not to stop skipping prematurely if we're inside a lookahead.

Browse Source 
Fixes: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3493#c2
This commit is contained in:
jzmaddock
2017-10-24 19:06:53 +01:00
parent 50453e319a
commit f251a98662
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/regex/v4/perl_matcher_non_recursive.hpp
View File

@ -1181,10 +1181,15 @@ bool perl_matcher<BidiIterator, Allocator, traits>::skip_until_paren(int index,
{ {
// Unenclosed closing ), occurs when (*ACCEPT) is inside some other // Unenclosed closing ), occurs when (*ACCEPT) is inside some other
// parenthesis which may or may not have other side effects associated with it. // parenthesis which may or may not have other side effects associated with it.
const re_syntax_base* sp = pstate;
match_endmark(); match_endmark();
if(!pstate) if(!pstate)
{ {
unwind(true); unwind(true);
// unwind may leave pstate NULL if we've unwound a forward lookahead, in which
// case just move to the next state and keep looking...
if (!pstate)
pstate = sp->next.p;
} }
} }
continue; continue;