<!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" />
<title>[168997] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168997">168997</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-05-17 14:42:43 -0700 (Sat, 17 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>NetworkProcess can repeatedly crash handling Blob messages after any unrelated crash
https://bugs.webkit.org/show_bug.cgi?id=133032
<rdar://problem/16951630>
Reviewed by Geoffrey Garen.
Replaced assertions with runtime checks. This can happen if NetworkProcess previously
crashed for any unrelated reason.
* NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
(WebKit::NetworkBlobRegistry::registerBlobURL):
(WebKit::NetworkBlobRegistry::registerBlobURLForSlice):
(WebKit::NetworkBlobRegistry::unregisterBlobURL):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp">trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168996 => 168997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-17 21:36:15 UTC (rev 168996)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-17 21:42:43 UTC (rev 168997)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-05-17 Alexey Proskuryakov <ap@apple.com>
+
+ NetworkProcess can repeatedly crash handling Blob messages after any unrelated crash
+ https://bugs.webkit.org/show_bug.cgi?id=133032
+ <rdar://problem/16951630>
+
+ Reviewed by Geoffrey Garen.
+
+ Replaced assertions with runtime checks. This can happen if NetworkProcess previously
+ crashed for any unrelated reason.
+
+ * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
+ (WebKit::NetworkBlobRegistry::registerBlobURL):
+ (WebKit::NetworkBlobRegistry::registerBlobURLForSlice):
+ (WebKit::NetworkBlobRegistry::unregisterBlobURL):
+
</ins><span class="cx"> 2014-05-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> -[WKWebView dealloc] should close the page
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (168996 => 168997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2014-05-17 21:36:15 UTC (rev 168996)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2014-05-17 21:42:43 UTC (rev 168997)
</span><span class="lines">@@ -74,29 +74,41 @@
</span><span class="cx">
</span><span class="cx"> void NetworkBlobRegistry::registerBlobURL(NetworkConnectionToWebProcess* connection, const WebCore::URL& url, const WebCore::URL& srcURL)
</span><span class="cx"> {
</span><ins>+ // The connection may not be registered if NetworkProcess prevously crashed for any reason.
+ BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(connection);
+ if (mapIterator == m_blobsForConnection.end())
+ return;
+
</ins><span class="cx"> blobRegistry().registerBlobURL(url, srcURL);
</span><span class="cx">
</span><del>- ASSERT(m_blobsForConnection.contains(connection));
- ASSERT(m_blobsForConnection.find(connection)->value.contains(srcURL));
- m_blobsForConnection.find(connection)->value.add(url);
</del><ins>+ ASSERT(mapIterator->value.contains(srcURL));
+ mapIterator->value.add(url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkBlobRegistry::registerBlobURLForSlice(NetworkConnectionToWebProcess* connection, const WebCore::URL& url, const WebCore::URL& srcURL, int64_t start, int64_t end)
</span><span class="cx"> {
</span><ins>+ // The connection may not be registered if NetworkProcess prevously crashed for any reason.
+ BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(connection);
+ if (mapIterator == m_blobsForConnection.end())
+ return;
+
</ins><span class="cx"> blobRegistry().registerBlobURLForSlice(url, srcURL, start, end);
</span><span class="cx">
</span><del>- ASSERT(m_blobsForConnection.contains(connection));
- ASSERT(m_blobsForConnection.find(connection)->value.contains(srcURL));
- m_blobsForConnection.find(connection)->value.add(url);
</del><ins>+ ASSERT(mapIterator->value.contains(srcURL));
+ mapIterator->value.add(url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkBlobRegistry::unregisterBlobURL(NetworkConnectionToWebProcess* connection, const WebCore::URL& url)
</span><span class="cx"> {
</span><ins>+ // The connection may not be registered if NetworkProcess prevously crashed for any reason.
+ BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(connection);
+ if (mapIterator == m_blobsForConnection.end())
+ return;
+
</ins><span class="cx"> blobRegistry().unregisterBlobURL(url);
</span><span class="cx">
</span><del>- ASSERT(m_blobsForConnection.contains(connection));
- ASSERT(m_blobsForConnection.find(connection)->value.contains(url));
- m_blobsForConnection.find(connection)->value.remove(url);
</del><ins>+ ASSERT(mapIterator->value.contains(url));
+ mapIterator->value.remove(url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t NetworkBlobRegistry::blobSize(NetworkConnectionToWebProcess* connection, const WebCore::URL& url)
</span></span></pre>
</div>
</div>
</body>
</html>