Changeset 18182 in webkit for trunk/JavaScriptCore/kjs/regexp_object.cpp

Timestamp:

Dec 12, 2006, 12:09:58 PM (18 years ago)

Author:

ap

Message:

Reviewed by Geoff. Based on a patch by Maks Orlovich.

​http://bugs.webkit.org/show_bug.cgi?id=6257
Throw errors on invalid expressions (KJS merge)

JavaScriptCore:

• kjs/regexp.cpp: (KJS::RegExp::RegExp): (KJS::RegExp::~RegExp): (KJS::RegExp::match):
• kjs/regexp.h: (KJS::RegExp::flags): (KJS::RegExp::isValid): (KJS::RegExp::errorMessage): (KJS::RegExp::subPatterns): Remember and report RegExp construction failures. Renamed data members not to start with underscores.

• kjs/regexp_object.cpp: (RegExpObjectImp::construct): Raise an exception if RegExp construction fails. (RegExpObjectImp::callAsFunction): Removed an obsolete comment.

• tests/mozilla/ecma_3/RegExp/regress-119909.js: Reduced the number of nested parentheses to a value supported by PCRE.

LayoutTests:

• fast/js/kde/RegExp-expected.txt: One more test passes.

File:

• trunk/JavaScriptCore/kjs/regexp_object.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -383 +383 @@
   bool ignoreCase = (flags.find("i") >= 0);
   bool multiline = (flags.find("m") >= 0);
-  // TODO: throw a syntax error on invalid flags
 
   dat->putDirect("global", jsBoolean(global), DontDelete | ReadOnly | DontEnum);
@@ -399 +398 @@
   if (multiline)
       reflags |= RegExp::Multiline;
-  dat->setRegExp(new RegExp(p, reflags));
+  RegExp* re = new RegExp(p, reflags);
+  if (!re->isValid()) {
+    delete re;
+    return throwError(exec, SyntaxError, UString("Invalid regular expression: ").append(re->errorMessage()));
+  }
+  dat->setRegExp(re);
 
   return dat;
@@ -407 +411 @@
 JSValue *RegExpObjectImp::callAsFunction(ExecState *exec, JSObject * /*thisObj*/, const List &args)
 {
-  // TODO: handle RegExp argument case (15.10.3.1)
-
   return construct(exec, args);
 }