Attachment 342302 Details for Bug 186433 – Patch

[patch] Patch

bug-186433-20180608115623.patch (text/plain), 2.71 KB, created by Chris Dumez on 2018-06-08 11:56:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-06-08 11:56:23 PDT

Size: 2.71 KB

patch

obsolete

>Subversion Revision: 232619
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 4df30a9f2664855a12b93defa7c5dd84d5f9dfab..e960a278714295b56bff8238f309cbe74e63e732 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-06-08  Chris Dumez  <cdumez@apple.com>
>+
>+        Crash under com.apple.WebKit.Networking at WebCore: WebCore::NetworkStorageSession::hasStorageAccess const
>+        https://bugs.webkit.org/show_bug.cgi?id=186433
>+        <rdar://problem/40750907>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Do some hardening in NetworkStorageSession::hasStorageAccess() to make sure
>+        we do not try and do a HashMap lookup with a null firstPartyDomain, as this
>+        would crash.
>+
>+        * platform/network/cf/NetworkStorageSessionCFNet.cpp:
>+        (WebCore::NetworkStorageSession::hasStorageAccess const):
>+
> 2018-06-07  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         [WTF] Add WorkerPool
>diff --git a/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp b/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp
>index 5fab809b41b82db3de34b27b0c8b79cc286dcd1d..22746f04417edc93d1d2a12d07526bdb2b31362f 100644
>--- a/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp
>+++ b/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp
>@@ -316,11 +316,13 @@ bool NetworkStorageSession::hasStorageAccess(const String& resourceDomain, const
>         }
>     }
> 
>-    auto pagesGrantedIterator = m_pagesGrantedStorageAccess.find(pageID);
>-    if (pagesGrantedIterator != m_pagesGrantedStorageAccess.end()) {
>-        auto it = pagesGrantedIterator->value.find(firstPartyDomain);
>-        if (it != pagesGrantedIterator->value.end() && it->value == resourceDomain)
>-            return true;
>+    if (!firstPartyDomain.isEmpty()) {
>+        auto pagesGrantedIterator = m_pagesGrantedStorageAccess.find(pageID);
>+        if (pagesGrantedIterator != m_pagesGrantedStorageAccess.end()) {
>+            auto it = pagesGrantedIterator->value.find(firstPartyDomain);
>+            if (it != pagesGrantedIterator->value.end() && it->value == resourceDomain)
>+                return true;
>+        }
>     }
> 
>     return false;
>@@ -340,6 +342,8 @@ Vector<String> NetworkStorageSession::getAllStorageAccessEntries() const
> void NetworkStorageSession::grantStorageAccess(const String& resourceDomain, const String& firstPartyDomain, std::optional<uint64_t> frameID, uint64_t pageID)
> {
>     if (!frameID) {
>+        if (firstPartyDomain.isEmpty())
>+            return;
>         auto pagesGrantedIterator = m_pagesGrantedStorageAccess.find(pageID);
>         if (pagesGrantedIterator == m_pagesGrantedStorageAccess.end()) {
>             HashMap<String, String> entry;

Actions: View | Formatted Diff | Diff

Attachments on bug 186433: 342295 | 342302 | 342348