Changeset 18256 in webkit

Timestamp:

Dec 16, 2006 4:31:30 AM (17 years ago)

Author:

ap

Message:

Reviewed by Rob.

A deleted object was accessed to prepare RegExp construction error messages.

• kjs/regexp_object.cpp: (RegExpObjectImp::construct): Wrap the RegExp into an OwnPtr.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/regexp_object.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-12-16  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Rob.
+
+        A deleted object was accessed to prepare RegExp construction error messages.
+
+        * kjs/regexp_object.cpp:
+        (RegExpObjectImp::construct): Wrap the RegExp into an OwnPtr.
+
 2006-12-16  Mitz Pettel  <mitz@webkit.org>
 

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -398 +398 @@
   if (multiline)
       reflags |= RegExp::Multiline;
-  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);
+
+  OwnPtr<RegExp> re(new RegExp(p, reflags));
+  if (!re->isValid())
+      return throwError(exec, SyntaxError, UString("Invalid regular expression: ").append(re->errorMessage()));
+
+  dat->setRegExp(re.release());
 
   return dat;