Attachment 347107 Details for Bug 188576 – Patch

[patch] Patch

bug-188576-20180814133831.patch (text/plain), 2.40 KB, created by Sihui Liu on 2018-08-14 13:38:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-08-14 13:38:32 PDT

Size: 2.40 KB

patch

obsolete

>Subversion Revision: 234815
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 9e3abc0e946fffc763238871f12bfa6ea0d55afa..65d1a0af42c99be2cffb0667841323372994c3f1 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-08-14  Sihui Liu  <sihui_liu@apple.com>
>+
>+        CrashTracer: [USER] com.apple.WebKit.Networking.Development at com.apple.WebKit: WTF::HashTable<WTF::String, WTF::String, WTF::IdentityExtractor, WTF::StringHash, WTF::HashTraits<WTF::String>, WTF::HashTraits<WTF::String> >::add + 26
>+        https://bugs.webkit.org/show_bug.cgi?id=188576
>+        <rdar://problem/43148977>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        callbackAggregator was accessed after it is moved.
>+
>+        * NetworkProcess/NetworkProcess.cpp:
>+        (WebKit::NetworkProcess::fetchWebsiteData):
>+
> 2018-08-13  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix linux build after r234811
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index 7de800e718a61dc27f47774916b558a977c5705f..eeeaf6b57cfc166f91a378e1e5ed88a86dc95762 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -557,18 +557,18 @@ void NetworkProcess::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<Websit
>         });
>     }
> 
>-    if (websiteDataTypes.contains(WebsiteDataType::DiskCache)) {
>-        fetchDiskCacheEntries(sessionID, fetchOptions, [callbackAggregator = WTFMove(callbackAggregator)](auto entries) mutable {
>-            callbackAggregator->m_websiteData.entries.appendVector(entries);
>-        });
>-    }
>-
> #if PLATFORM(COCOA)
>     if (websiteDataTypes.contains(WebsiteDataType::HSTSCache)) {
>         if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>             getHostNamesWithHSTSCache(*networkStorageSession, callbackAggregator->m_websiteData.hostNamesWithHSTSCache);
>     }
> #endif
>+
>+    if (websiteDataTypes.contains(WebsiteDataType::DiskCache)) {
>+        fetchDiskCacheEntries(sessionID, fetchOptions, [callbackAggregator = WTFMove(callbackAggregator)](auto entries) mutable {
>+            callbackAggregator->m_websiteData.entries.appendVector(entries);
>+        });
>+    }
> }
> 
> void NetworkProcess::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, WallTime modifiedSince, uint64_t callbackID)

Actions: View | Formatted Diff | Diff

Attachments on bug 188576: 347107 | 347130 | 347134