wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 627609 followup: address comments and check for start of opcode stream before atOptionalBracket

Browse Source
This commit is contained in:
David Mandelin 2011-01-31 16:15:56 -08:00
parent fddedf5950
commit 8e65dc49e0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/yarr/pcre/pcre_exec.cpp
View File

@ -429,6 +429,10 @@ struct MatchStack {
/* Return true iff the instruction pointer is currently at an optional bracket,
i.e., a bracket that may be matched zero times. */
bool atOptionalBracket() const {
/* We don't need to include OP_BRAMINZERO: we try to match the group within
the BRAMINZERO only if we have already failed to match the rest of the
regular expression. Thus, we will not be able to complete a successful
match by matching the group against the empty string anyway. */
unsigned char prevOp = currentFrame->args.instructionPtr[-1];
return prevOp == OP_BRAZERO;
}
@ -547,7 +551,8 @@ RECURSE:
bracket data. */
stack.currentFrame->locals.skipBytes = 3;
/* We must compute this value at the top, before we move the instruction pointer. */
stack.currentFrame->locals.minSatisfied = stack.atOptionalBracket();
stack.currentFrame->locals.minSatisfied = instructionPtr != stack.currentFrame->args.instructionPtr &&
stack.atOptionalBracket();
do {
/* We need to extract this into a variable so we can correctly pass it by value
through RECURSIVE_MATCH_NEW_GROUP, which modifies currentFrame. */