Title: [258530] trunk/Source/WebKit
- Revision
- 258530
- Author
- [email protected]
- Date
- 2020-03-16 17:03:57 -0700 (Mon, 16 Mar 2020)
Log Message
Crash under WebCookieCache::clearForHost()
https://bugs.webkit.org/show_bug.cgi?id=209149
<rdar://problem/60453086>
Reviewed by Darin Adler.
Alternative fix for Bug 209149 based on comments from Darin.
* WebProcess/WebPage/WebCookieCache.cpp:
(WebKit::WebCookieCache::clearForHost):
(WebKit::WebCookieCache::pruneCacheIfNecessary):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (258529 => 258530)
--- trunk/Source/WebKit/ChangeLog 2020-03-16 23:56:49 UTC (rev 258529)
+++ trunk/Source/WebKit/ChangeLog 2020-03-17 00:03:57 UTC (rev 258530)
@@ -1,3 +1,17 @@
+2020-03-16 Chris Dumez <[email protected]>
+
+ Crash under WebCookieCache::clearForHost()
+ https://bugs.webkit.org/show_bug.cgi?id=209149
+ <rdar://problem/60453086>
+
+ Reviewed by Darin Adler.
+
+ Alternative fix for Bug 209149 based on comments from Darin.
+
+ * WebProcess/WebPage/WebCookieCache.cpp:
+ (WebKit::WebCookieCache::clearForHost):
+ (WebKit::WebCookieCache::pruneCacheIfNecessary):
+
2020-03-16 Tim Horton <[email protected]>
Fix the macCatalyst build after r258525
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebCookieCache.cpp (258529 => 258530)
--- trunk/Source/WebKit/WebProcess/WebPage/WebCookieCache.cpp 2020-03-16 23:56:49 UTC (rev 258529)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebCookieCache.cpp 2020-03-17 00:03:57 UTC (rev 258530)
@@ -102,14 +102,13 @@
void WebCookieCache::clearForHost(const String& host)
{
- auto it = m_hostsWithInMemoryStorage.find(host);
- if (it == m_hostsWithInMemoryStorage.end())
+ String removedHost = m_hostsWithInMemoryStorage.take(host);
+ if (removedHost.isNull())
return;
- m_hostsWithInMemoryStorage.remove(it);
- inMemoryStorageSession().deleteCookiesForHostnames(Vector<String> { host });
+ inMemoryStorageSession().deleteCookiesForHostnames(Vector<String> { removedHost });
#if HAVE(COOKIE_CHANGE_LISTENER_API)
- WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::UnsubscribeFromCookieChangeNotifications(HashSet<String> { host }), 0);
+ WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::UnsubscribeFromCookieChangeNotifications(HashSet<String> { removedHost }), 0);
#endif
}
@@ -118,10 +117,8 @@
// We may want to raise this limit if we start using the cache for third-party iframes.
static const unsigned maxCachedHosts = 5;
- while (m_hostsWithInMemoryStorage.size() >= maxCachedHosts) {
- String hostToRemove = *m_hostsWithInMemoryStorage.random();
- clearForHost(hostToRemove);
- }
+ while (m_hostsWithInMemoryStorage.size() >= maxCachedHosts)
+ clearForHost(*m_hostsWithInMemoryStorage.random());
}
#if !PLATFORM(COCOA)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
