Attachment 372870 Details for Bug 199208 – Patch

[patch] Patch

bug-199208-20190625154955.patch (text/plain), 1.88 KB, created by Alex Christensen on 2019-06-25 15:49:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-06-25 15:49:56 PDT

Size: 1.88 KB

patch

obsolete

>Subversion Revision: 246807
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 3606540b3dfcd41dca9862d77e64de922e31f2ad..f611a6b08e3618cb62b6960988eb6f655b2fd5ae 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-06-25  Alex Christensen  <achristensen@webkit.org>
>+
>+        Add HashMap.contains check in SessionStorageNamespace::removeAllowedConnection
>+        https://bugs.webkit.org/show_bug.cgi?id=199208
>+        <rdar://problem/32106147>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/WebStorage/StorageManager.cpp:
>+        (WebKit::StorageManager::SessionStorageNamespace::removeAllowedConnection):
>+        removeAllowedConnection is called when a page is removed and when a connection is closed, and sometimes they both happen.
>+        When it does happen, there's nothing to remove.
>+
> 2019-06-25  Alex Christensen  <achristensen@webkit.org>
> 
>         Make HTTPCookieAcceptPolicy an enum class
>diff --git a/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp b/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp
>index 50fde90d615ed58896015c69a2b09152fd2fb27b..8ababca421fb0bdc09e35dc942c1c0ba1b2a4cb4 100644
>--- a/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp
>+++ b/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp
>@@ -482,7 +482,8 @@ void StorageManager::SessionStorageNamespace::addAllowedConnection(IPC::Connecti
> void StorageManager::SessionStorageNamespace::removeAllowedConnection(IPC::Connection::UniqueID allowedConnection)
> {
>     ASSERT(m_allowedConnections.contains(allowedConnection));
>-    m_allowedConnections.remove(allowedConnection);
>+    if (m_allowedConnections.contains(allowedConnection))
>+        m_allowedConnections.remove(allowedConnection);
> }
> auto StorageManager::SessionStorageNamespace::getOrCreateStorageArea(SecurityOriginData&& securityOrigin) -> Ref<StorageArea>
> {

Actions: View | Formatted Diff | Diff

Attachments on bug 199208: 372870