<!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>[20671] trunk/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20671">20671</a></dd>
<dt>Author</dt> <dd>andersca</dd>
<dt>Date</dt> <dd>2007-04-02 16:49:03 -0700 (Mon, 02 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Reviewed by Geoff.
Fix crash when running plugins/destroy-stream-twice.html under GuardMalloc
* Plugins/WebBaseNetscapePluginStream.h:
* Plugins/WebBaseNetscapePluginStream.mm:
(+[WebBaseNetscapePluginStream ownerForStream:]):
(-[WebBaseNetscapePluginStream initWithRequestURL:plugin:notifyData:sendNotification:]):
(-[WebBaseNetscapePluginStream dealloc]):
(-[WebBaseNetscapePluginStream finalize]):
Change the streams hash map to contain an NPStream*, and change ownerForStream to take an NPStream*.
* Plugins/WebBaseNetscapePluginView.mm:
(-[WebBaseNetscapePluginView destroyStream:reason:]):
Check that the NPStream pointer is valid before accessing stream->ndata.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitChangeLog">trunk/WebKit/ChangeLog</a></li>
<li><a href="#trunkWebKitPluginsWebBaseNetscapePluginStreamh">trunk/WebKit/Plugins/WebBaseNetscapePluginStream.h</a></li>
<li><a href="#trunkWebKitPluginsWebBaseNetscapePluginStreammm">trunk/WebKit/Plugins/WebBaseNetscapePluginStream.mm</a></li>
<li><a href="#trunkWebKitPluginsWebBaseNetscapePluginViewmm">trunk/WebKit/Plugins/WebBaseNetscapePluginView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/ChangeLog (20670 => 20671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/ChangeLog 2007-04-02 23:41:57 UTC (rev 20670)
+++ trunk/WebKit/ChangeLog 2007-04-02 23:49:03 UTC (rev 20671)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2007-04-02 Anders Carlsson <andersca@apple.com>
+
+ Reviewed by Geoff.
+
+ Fix crash when running plugins/destroy-stream-twice.html under GuardMalloc
+
+ * Plugins/WebBaseNetscapePluginStream.h:
+ * Plugins/WebBaseNetscapePluginStream.mm:
+ (+[WebBaseNetscapePluginStream ownerForStream:]):
+ (-[WebBaseNetscapePluginStream initWithRequestURL:plugin:notifyData:sendNotification:]):
+ (-[WebBaseNetscapePluginStream dealloc]):
+ (-[WebBaseNetscapePluginStream finalize]):
+ Change the streams hash map to contain an NPStream*, and change ownerForStream to take an NPStream*.
+
+ * Plugins/WebBaseNetscapePluginView.mm:
+ (-[WebBaseNetscapePluginView destroyStream:reason:]):
+ Check that the NPStream pointer is valid before accessing stream->ndata.
+
</ins><span class="cx"> 2007-04-02 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Geoff.
</span></span></pre></div>
<a id="trunkWebKitPluginsWebBaseNetscapePluginStreamh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/Plugins/WebBaseNetscapePluginStream.h (20670 => 20671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/Plugins/WebBaseNetscapePluginStream.h 2007-04-02 23:41:57 UTC (rev 20670)
+++ trunk/WebKit/Plugins/WebBaseNetscapePluginStream.h 2007-04-02 23:49:03 UTC (rev 20671)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> NPP_URLNotifyProcPtr NPP_URLNotify;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-+ (NPP)ownerForStream:(WebBaseNetscapePluginStream *)stream;
</del><ins>++ (NPP)ownerForStream:(NPStream *)stream;
</ins><span class="cx"> + (NPReason)reasonForError:(NSError *)error;
</span><span class="cx">
</span><span class="cx"> - (NSError *)errorForReason:(NPReason)theReason;
</span></span></pre></div>
<a id="trunkWebKitPluginsWebBaseNetscapePluginStreammm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/Plugins/WebBaseNetscapePluginStream.mm (20670 => 20671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/Plugins/WebBaseNetscapePluginStream.mm 2007-04-02 23:41:57 UTC (rev 20670)
+++ trunk/WebKit/Plugins/WebBaseNetscapePluginStream.mm 2007-04-02 23:49:03 UTC (rev 20671)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> static char *CarbonPathFromPOSIXPath(const char *posixPath);
</span><span class="cx">
</span><del>-typedef HashMap<WebBaseNetscapePluginStream *, NPP> StreamMap;
</del><ins>+typedef HashMap<NPStream*, NPP> StreamMap;
</ins><span class="cx"> static StreamMap& streams()
</span><span class="cx"> {
</span><span class="cx"> static StreamMap staticStreams;
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-+ (NPP)ownerForStream:(WebBaseNetscapePluginStream *)stream
</del><ins>++ (NPP)ownerForStream:(NPStream *)stream
</ins><span class="cx"> {
</span><span class="cx"> return streams().get(stream);
</span><span class="cx"> }
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> notifyData = theNotifyData;
</span><span class="cx"> sendNotification = flag;
</span><span class="cx">
</span><del>- streams().add(self, thePlugin);
</del><ins>+ streams().add(&stream, thePlugin);
</ins><span class="cx">
</span><span class="cx"> isTerminated = NO;
</span><span class="cx">
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> free((void *)stream.url);
</span><span class="cx"> free(path);
</span><span class="cx">
</span><del>- streams().remove(self);
</del><ins>+ streams().remove(&stream);
</ins><span class="cx">
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> free((void *)stream.url);
</span><span class="cx"> free(path);
</span><span class="cx">
</span><del>- streams().remove(self);
</del><ins>+ streams().remove(&stream);
</ins><span class="cx">
</span><span class="cx"> [super finalize];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebKitPluginsWebBaseNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/Plugins/WebBaseNetscapePluginView.mm (20670 => 20671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/Plugins/WebBaseNetscapePluginView.mm 2007-04-02 23:41:57 UTC (rev 20670)
+++ trunk/WebKit/Plugins/WebBaseNetscapePluginView.mm 2007-04-02 23:49:03 UTC (rev 20671)
</span><span class="lines">@@ -2330,16 +2330,17 @@
</span><span class="cx"> -(NPError)destroyStream:(NPStream*)stream reason:(NPReason)reason
</span><span class="cx"> {
</span><span class="cx"> LOG(Plugins, "NPN_DestroyStream");
</span><del>- WebBaseNetscapePluginStream *browserStream = static_cast<WebBaseNetscapePluginStream *>(stream->ndata);
-
</del><span class="cx"> // This function does a sanity check to ensure that the NPStream provided actually
</span><span class="cx"> // belongs to the plug-in that provided it, which fixes a crash in the DivX
</span><span class="cx"> // plug-in: <rdar://problem/5093862> | http://bugs.webkit.org/show_bug.cgi?id=13203
</span><del>- if (!stream || [WebBaseNetscapePluginStream ownerForStream:browserStream] != plugin) {
</del><ins>+ if (!stream || [WebBaseNetscapePluginStream ownerForStream:stream] != plugin) {
</ins><span class="cx"> LOG(Plugins, "Invalid NPStream passed to NPN_DestroyStream: %p", stream);
</span><span class="cx"> return NPERR_INVALID_INSTANCE_ERROR;
</span><span class="cx"> }
</span><ins>+
+ WebBaseNetscapePluginStream *browserStream = static_cast<WebBaseNetscapePluginStream *>(stream->ndata);
</ins><span class="cx"> [browserStream cancelLoadAndDestroyStreamWithError:[browserStream errorForReason:reason]];
</span><ins>+
</ins><span class="cx"> return NPERR_NO_ERROR;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>