Changeset 68146 in webkit

Timestamp:

Sep 23, 2010 8:56:59 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-23 Luiz Agostini <​luiz.agostini@openbossa.org>

Reviewed by Andreas Kling.

Invalid assertion in ScriptCallback
​https://bugs.webkit.org/show_bug.cgi?id=46348

Removing invalid ASSERT from method ScriptCallback::call().

• bindings/js/ScriptFunctionCall.cpp: (WebCore::ScriptCallback::call):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ScriptFunctionCall.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-23  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        Invalid assertion in ScriptCallback
+        https://bugs.webkit.org/show_bug.cgi?id=46348
+
+        Removing invalid ASSERT from method ScriptCallback::call().
+
+        * bindings/js/ScriptFunctionCall.cpp:
+        (WebCore::ScriptCallback::call):
+
 2010-09-23  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebCore/bindings/js/ScriptFunctionCall.cpp

@@ -216 +216 @@
     CallData callData;
     CallType callType = getCallData(m_function.jsValue(), callData);
-
-    ASSERT(callType != CallTypeNone);
+    if (callType == CallTypeNone)
+        return ScriptValue();
 
     JSValue result = JSC::call(m_exec, m_function.jsValue(), callType, callData, m_function.jsValue(), m_arguments);