Changeset 33372 in webkit

Timestamp:

May 13, 2008 12:11:01 AM (16 years ago)

Author:

oliver@apple.com

Message:

Bug 18752: SQUIRRELFISH: exceptions are not always handled by the vm
<​https://bugs.webkit.org/show_bug.cgi?id=18752>

Reviewed by Geoff

First step: prevent incorrect evaluation of valueOf/toString conversion
in right hand side of expression after earlier conversion throws.

Location:

branches/squirrelfish/JavaScriptCore

Files:

• API/JSCallbackObjectFunctions.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• kjs/object.cpp (modified) (1 diff)

branches/squirrelfish/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -367 +367 @@
 double JSCallbackObject<Base>::toNumber(ExecState* exec) const
 {
+    // We need this check to guard against the case where this object is rhs of
+    // a binary expression where lhs threw an exception in its conversion to
+    // primitive
+    if (exec->hadException())
+        return NaN;
     JSContextRef ctx = toRef(exec);
     JSObjectRef thisRef = toRef(this);

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-13  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Geoff.
+
+        Bug 18752: SQUIRRELFISH: exceptions are not always handled by the vm
+        <https://bugs.webkit.org/show_bug.cgi?id=18752>
+
+        First step: prevent incorrect evaluation of valueOf/toString conversion
+        in right hand side of expression after earlier conversion throws.
+
+        * API/JSCallbackObjectFunctions.h:
+        (KJS::::toNumber):
+        * kjs/object.cpp:
+        (KJS::JSObject::defaultValue):
+
 2008-05-12  Oliver Hunt  <oliver@apple.com>
 

branches/squirrelfish/JavaScriptCore/kjs/object.cpp

@@ -341 +341 @@
 JSValue* JSObject::defaultValue(ExecState* exec, JSType hint) const
 {
+  // We need this check to guard against the case where this object is rhs of
+  // a binary expression where lhs threw an exception in its conversion to
+  // primitive
+  if (exec->hadException())
+    return exec->exception();
   /* Prefer String for Date objects */
   if ((hint == StringType) || (hint != NumberType && _proto == exec->lexicalGlobalObject()->datePrototype())) {