Reviewers: danno,
Description:
Fix crash bug in VisitChoice (bug=126272).
Please review this at https://chromiumcodereview.appspot.com/10332035/
SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/
Affected files:
M src/jsregexp.cc
M test/mjsunit/regexp-capture-3.js
Index: src/jsregexp.cc
===================================================================
--- src/jsregexp.cc (revision 11496)
+++ src/jsregexp.cc (working copy)
@@ -2722,8 +2722,8 @@
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 @@
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 @@
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;
Index: test/mjsunit/regexp-capture-3.js
===================================================================
--- test/mjsunit/regexp-capture-3.js (revision 11496)
+++ test/mjsunit/regexp-capture-3.js (working copy)
@@ -212,3 +212,7 @@
var regex10 = new RegExp(re, "i");
regex10.exec(input0);
+
+var regex11 = /^(?:[^\u0000-\u0080]|[0-9a-z?,.!&\s#()])+$/i;
+regex11.exec(input0);
+
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
