<!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>[150543] 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/150543">150543</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-05-22 14:25:22 -0700 (Wed, 22 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix crash when closing a page that's trying to access session storage
https://bugs.webkit.org/show_bug.cgi?id=116634
&lt;rdar://problem/13904054&gt;

Reviewed by Geoffrey Garen.

It is possible for the StorageManager to get messages from a web page that has already been closed by the UI process.
If that happens, just ignore the messages.

* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::createSessionStorageMap):
(WebKit::StorageManager::getValues):
(WebKit::StorageManager::setItem):
(WebKit::StorageManager::removeItem):
(WebKit::StorageManager::clear):
(WebKit::StorageManager::destroySessionStorageNamespaceInternal):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (150542 => 150543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2013-05-22 21:22:56 UTC (rev 150542)
+++ trunk/Source/WebKit2/ChangeLog        2013-05-22 21:25:22 UTC (rev 150543)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-05-22  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Fix crash when closing a page that's trying to access session storage
+        https://bugs.webkit.org/show_bug.cgi?id=116634
+        &lt;rdar://problem/13904054&gt;
+
+        Reviewed by Geoffrey Garen.
+
+        It is possible for the StorageManager to get messages from a web page that has already been closed by the UI process.
+        If that happens, just ignore the messages.
+
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::createSessionStorageMap):
+        (WebKit::StorageManager::getValues):
+        (WebKit::StorageManager::setItem):
+        (WebKit::StorageManager::removeItem):
+        (WebKit::StorageManager::clear):
+        (WebKit::StorageManager::destroySessionStorageNamespaceInternal):
+
</ins><span class="cx"> 2013-05-22  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Crashes in NetworkProcess due to incorrect private browsing session tracking
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (150542 => 150543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp        2013-05-22 21:22:56 UTC (rev 150542)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp        2013-05-22 21:25:22 UTC (rev 150543)
</span><span class="lines">@@ -473,9 +473,13 @@
</span><span class="cx"> 
</span><span class="cx">     ASSERT((HashMap&lt;uint64_t, RefPtr&lt;SessionStorageNamespace&gt;&gt;::isValidKey(storageNamespaceID)));
</span><span class="cx">     SessionStorageNamespace* sessionStorageNamespace = m_sessionStorageNamespaces.get(storageNamespaceID);
</span><ins>+    if (!sessionStorageNamespace) {
+        // We're getting an incoming message from the web process that's for session storage for a web page
+        // that has already been closed, just ignore it.
+        return;
+    }
</ins><span class="cx"> 
</span><del>-    // FIXME: These should be message checks.
-    ASSERT(sessionStorageNamespace);
</del><ins>+    // FIXME: This should be a message check.
</ins><span class="cx">     ASSERT(connection == sessionStorageNamespace-&gt;allowedConnection());
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;StorageArea&gt; storageArea = sessionStorageNamespace-&gt;getOrCreateStorageArea(securityOriginData.securityOrigin());
</span><span class="lines">@@ -503,10 +507,11 @@
</span><span class="cx"> void StorageManager::getValues(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t storageMapSeed, HashMap&lt;String, String&gt;&amp; values)
</span><span class="cx"> {
</span><span class="cx">     StorageArea* storageArea = findStorageArea(connection, storageMapID);
</span><ins>+    if (!storageArea) {
+        // This is a session storage area for a page that has already been closed. Ignore it.
+        return;
+    }
</ins><span class="cx"> 
</span><del>-    // FIXME: This should be a message check.
-    ASSERT(storageArea);
-
</del><span class="cx">     values = storageArea-&gt;items();
</span><span class="cx">     connection-&gt;send(Messages::StorageAreaMap::DidGetValues(storageMapSeed), storageMapID);
</span><span class="cx"> }
</span><span class="lines">@@ -514,10 +519,11 @@
</span><span class="cx"> void StorageManager::setItem(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String&amp; key, const String&amp; value, const String&amp; urlString)
</span><span class="cx"> {
</span><span class="cx">     StorageArea* storageArea = findStorageArea(connection, storageMapID);
</span><ins>+    if (!storageArea) {
+        // This is a session storage area for a page that has already been closed. Ignore it.
+        return;
+    }
</ins><span class="cx"> 
</span><del>-    // FIXME: This should be a message check.
-    ASSERT(storageArea);
-
</del><span class="cx">     bool quotaError;
</span><span class="cx">     storageArea-&gt;setItem(connection, sourceStorageAreaID, key, value, urlString, quotaError);
</span><span class="cx">     connection-&gt;send(Messages::StorageAreaMap::DidSetItem(storageMapSeed, key, quotaError), storageMapID);
</span><span class="lines">@@ -526,10 +532,11 @@
</span><span class="cx"> void StorageManager::removeItem(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String&amp; key, const String&amp; urlString)
</span><span class="cx"> {
</span><span class="cx">     StorageArea* storageArea = findStorageArea(connection, storageMapID);
</span><ins>+    if (!storageArea) {
+        // This is a session storage area for a page that has already been closed. Ignore it.
+        return;
+    }
</ins><span class="cx"> 
</span><del>-    // FIXME: This should be a message check.
-    ASSERT(storageArea);
-
</del><span class="cx">     storageArea-&gt;removeItem(connection, sourceStorageAreaID, key, urlString);
</span><span class="cx">     connection-&gt;send(Messages::StorageAreaMap::DidRemoveItem(storageMapSeed, key), storageMapID);
</span><span class="cx"> }
</span><span class="lines">@@ -537,10 +544,11 @@
</span><span class="cx"> void StorageManager::clear(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String&amp; urlString)
</span><span class="cx"> {
</span><span class="cx">     StorageArea* storageArea = findStorageArea(connection, storageMapID);
</span><ins>+    if (!storageArea) {
+        // This is a session storage area for a page that has already been closed. Ignore it.
+        return;
+    }
</ins><span class="cx"> 
</span><del>-    // FIXME: This should be a message check.
-    ASSERT(storageArea);
-
</del><span class="cx">     storageArea-&gt;clear(connection, sourceStorageAreaID, urlString);
</span><span class="cx">     connection-&gt;send(Messages::StorageAreaMap::DidClear(storageMapSeed), storageMapID);
</span><span class="cx"> }
</span><span class="lines">@@ -555,7 +563,6 @@
</span><span class="cx"> void StorageManager::destroySessionStorageNamespaceInternal(uint64_t storageNamespaceID)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_sessionStorageNamespaces.contains(storageNamespaceID));
</span><del>-
</del><span class="cx">     m_sessionStorageNamespaces.remove(storageNamespaceID);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>