AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix crash bug in VisitChoice (bug=126272).

Browse Source 
Review URL: https://chromiumcodereview.appspot.com/10332035

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11519 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
erik.corry@gmail.com 2012-05-07 13:23:56 +00:00
parent 63263a9aa9
commit 80256c7452
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/jsregexp.cc
View File

@ -2722,8 +2722,8 @@ RegExpNode* ChoiceNode::FilterASCII(int depth) {
GuardedAlternative alternative = alternatives_->at(i);
RegExpNode* replacement = alternative.node()->FilterASCII(depth - 1);
ASSERT(replacement != this); // No missing EMPTY_MATCH_CHECK.
alternatives_->at(i).set_node(replacement);
if (replacement != NULL) {
alternatives_->at(i).set_node(replacement);
surviving++;
survivor = replacement;
}
@ -2739,9 +2739,11 @@ RegExpNode* ChoiceNode::FilterASCII(int depth) {
ZoneList<GuardedAlternative>* new_alternatives =
new ZoneList<GuardedAlternative>(surviving);
for (int i = 0; i < choice_count; i++) {
GuardedAlternative alternative = alternatives_->at(i);
if (alternative.node() != NULL) {
new_alternatives->Add(alternative);
RegExpNode* replacement =
alternatives_->at(i).node()->FilterASCII(depth - 1);
if (replacement != NULL) {
alternatives_->at(i).set_node(replacement);
new_alternatives->Add(alternatives_->at(i));
}
}
alternatives_ = new_alternatives;
@ -5832,7 +5834,12 @@ RegExpEngine::CompilationResult RegExpEngine::Compile(
node = loop_node;
}
}
if (is_ascii) node = node->FilterASCII(RegExpCompiler::kMaxRecursion);
if (is_ascii) {
node = node->FilterASCII(RegExpCompiler::kMaxRecursion);
// Do it again to propagate the new nodes to places where they were not
// put because they had not been calculated yet.
if (node != NULL) node = node->FilterASCII(RegExpCompiler::kMaxRecursion);
}
if (node == NULL) node = new EndNode(EndNode::BACKTRACK);
data->node = node;

4
test/mjsunit/regexp-capture-3.js
View File

@ -212,3 +212,7 @@ regex9.exec(input0);
var regex10 = new RegExp(re, "i");
regex10.exec(input0);
var regex11 = /^(?:[^\u0000-\u0080]|[0-9a-z?,.!&\s#()])+$/i;
regex11.exec(input0);