Changeset 161229 in webkit

Timestamp:

Jan 2, 2014 2:43:57 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

CStack: Interpreter::executeCall() should check for exceptions after calling callToNativeFunction().
​https://bugs.webkit.org/show_bug.cgi?id=126405.

Not yet reviewed.

• interpreter/Interpreter.cpp:

(JSC::Interpreter::executeCall):

• executeCall() was expecting to return a non-null JSValue but neglected to check if an exception was thrown during a call to callToNativeFunction. We now check if an exception was thrown, and if so, we set the result to jsNull() the same way that JITCode::execute() does.

Location:

branches/jsCStack/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/Interpreter.cpp (modified) (1 diff)

branches/jsCStack/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-02  Mark Lam  <mark.lam@apple.com>
+
+        CStack: Interpreter::executeCall() should check for exceptions after calling callToNativeFunction().
+        https://bugs.webkit.org/show_bug.cgi?id=126405.
+
+        Not yet reviewed.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::executeCall):
+        - executeCall() was expecting to return a non-null JSValue but neglected
+          to check if an exception was thrown during a call to callToNativeFunction.
+          We now check if an exception was thrown, and if so, we set the result to
+          jsNull() the same that JITCode::execute() does.
+
 2014-01-02  Filip Pizlo  <fpizlo@apple.com>
 

branches/jsCStack/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -967 +967 @@
         if (isJSCall)
             result = callData.js.functionExecutable->generatedJITCodeForCall()->execute(&vm, &protoCallFrame);
-        else
+        else {
             result = JSValue::decode(callToNativeFunction(reinterpret_cast<void*>(callData.native.function), &vm, &protoCallFrame));
+            if (callFrame->hadException())
+                result = jsNull();
+        }
     }