Changeset 150925 in webkit

Timestamp:

May 29, 2013 12:43:30 PM (11 years ago)

Author:

andersca@apple.com

Message:

Return earlier if there's no session storage namespace
​https://bugs.webkit.org/show_bug.cgi?id=116984
<rdar://problem/13976781>

Reviewed by Tim Horton.

If we can't find a session storage namespace, return before creating an entry in the m_storageAreasByConnection
hash map since then we'll crash trying to remove it later.

• UIProcess/Storage/StorageManager.cpp:

(WebKit::StorageManager::createSessionStorageMap):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Storage/StorageManager.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-29  Anders Carlsson  <andersca@apple.com>
+
+        Return earlier if there's no session storage namespace
+        https://bugs.webkit.org/show_bug.cgi?id=116984
+        <rdar://problem/13976781>
+
+        Reviewed by Tim Horton.
+
+        If we can't find a session storage namespace, return before creating an entry in the m_storageAreasByConnection
+        hash map since then we'll crash trying to remove it later.
+
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::createSessionStorageMap):
+
 2013-05-29  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp

@@ -462 +462 @@
 void StorageManager::createSessionStorageMap(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
 {
-    std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
-
     // FIXME: This should be a message check.
-    ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair)));
-
-    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, 0);
-
-    // FIXME: This should be a message check.
-    ASSERT(result.isNewEntry);
-
     ASSERT((HashMap<uint64_t, RefPtr<SessionStorageNamespace>>::isValidKey(storageNamespaceID)));
     SessionStorageNamespace* sessionStorageNamespace = m_sessionStorageNamespaces.get(storageNamespaceID);
@@ -480 +471 @@
     }
 
+    std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
+
+    // FIXME: This should be a message check.
+    ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair)));
+
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, 0);
+
+    // FIXME: This should be a message check.
+    ASSERT(result.isNewEntry);
+
     // FIXME: This should be a message check.
     ASSERT(connection == sessionStorageNamespace->allowedConnection());