<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[20695] trunk</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20695">20695</a></dd>
<dt>Author</dt> <dd>andersca</dd>
<dt>Date</dt> <dd>2007-04-03 18:32:00 -0700 (Tue, 03 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>JavaScriptCore:
Reviewed by Adam.
<rdar://problem/5107534>
http://bugs.webkit.org/show_bug.cgi?id=13265
REGRESSION: Crash in KJS::Bindings::convertValueToNPVariant
* bindings/NP_jsobject.cpp:
(_NPN_InvokeDefault):
Return false if the object isn't a function.
LayoutTests:
Reviewed by Adam.
<rdar://problem/5107534>
http://bugs.webkit.org/show_bug.cgi?id=13265
REGRESSION: Crash in KJS::Bindings::convertValueToNPVariant
* plugins/netscape-invoke-default.html:
Test calling NPN_InvokeDefault on an object that isn't a function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCorebindingsNP_jsobjectcpp">trunk/JavaScriptCore/bindings/NP_jsobject.cpp</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestspluginsnetscapeinvokedefaulthtml">trunk/LayoutTests/plugins/netscape-invoke-default.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (20694 => 20695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog 2007-04-04 00:22:06 UTC (rev 20694)
+++ trunk/JavaScriptCore/ChangeLog 2007-04-04 01:32:00 UTC (rev 20695)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2007-04-03 Anders Carlsson <andersca@apple.com>
+
+ Reviewed by Adam.
+
+ <rdar://problem/5107534>
+ http://bugs.webkit.org/show_bug.cgi?id=13265
+ REGRESSION: Crash in KJS::Bindings::convertValueToNPVariant
+
+ * bindings/NP_jsobject.cpp:
+ (_NPN_InvokeDefault):
+ Return false if the object isn't a function.
+
</ins><span class="cx"> 2007-03-30 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix.
</span></span></pre></div>
<a id="trunkJavaScriptCorebindingsNP_jsobjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/bindings/NP_jsobject.cpp (20694 => 20695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/bindings/NP_jsobject.cpp 2007-04-04 00:22:06 UTC (rev 20694)
+++ trunk/JavaScriptCore/bindings/NP_jsobject.cpp 2007-04-04 01:32:00 UTC (rev 20695)
</span><span class="lines">@@ -108,6 +108,8 @@
</span><span class="cx"> if (!_isSafeScript(obj))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ VOID_TO_NPVARIANT(*result);
+
</ins><span class="cx"> // Lookup the function object.
</span><span class="cx"> RootObject* rootObject = obj->rootObject;
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="lines">@@ -118,6 +120,9 @@
</span><span class="cx">
</span><span class="cx"> // Call the function object.
</span><span class="cx"> JSObject *funcImp = static_cast<JSObject*>(obj->imp);
</span><ins>+ if (!funcImp->implementsCall())
+ return false;
+
</ins><span class="cx"> List argList = listFromVariantArgs(exec, args, argCount);
</span><span class="cx"> JSValue *resultV = funcImp->call (exec, funcImp, argList);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog ( => )</h4>
<pre class="diff"><span>
<span class="info">
</span></span></pre>
</div>
</div>
</body>
</html>