Title: [239781] branches/safari-607-branch/Source/WebKit
- Revision
- 239781
- Author
- alanc...@apple.com
- Date
- 2019-01-09 12:47:11 -0800 (Wed, 09 Jan 2019)
Log Message
Cherry-pick r239776. rdar://problem/47147610
WebKit Networking process crashes if the HTTPSUpgradeList is not found in the bundle
https://bugs.webkit.org/show_bug.cgi?id=193285
<rdar://problem/47147610>
Reviewed by Geoffrey Garen.
* NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
(WebKit::networkHTTPSUpgradeCheckerDatabasePath):
(WebKit::NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239776 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (239780 => 239781)
--- branches/safari-607-branch/Source/WebKit/ChangeLog 2019-01-09 20:05:09 UTC (rev 239780)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog 2019-01-09 20:47:11 UTC (rev 239781)
@@ -1,3 +1,31 @@
+2019-01-09 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r239776. rdar://problem/47147610
+
+ WebKit Networking process crashes if the HTTPSUpgradeList is not found in the bundle
+ https://bugs.webkit.org/show_bug.cgi?id=193285
+ <rdar://problem/47147610>
+
+ Reviewed by Geoffrey Garen.
+
+ * NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
+ (WebKit::networkHTTPSUpgradeCheckerDatabasePath):
+ (WebKit::NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239776 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-09 Chris Dumez <cdu...@apple.com>
+
+ WebKit Networking process crashes if the HTTPSUpgradeList is not found in the bundle
+ https://bugs.webkit.org/show_bug.cgi?id=193285
+ <rdar://problem/47147610>
+
+ Reviewed by Geoffrey Garen.
+
+ * NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
+ (WebKit::networkHTTPSUpgradeCheckerDatabasePath):
+ (WebKit::NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker):
+
2019-01-07 Alex Christensen <achristen...@webkit.org>
Modernize CacheModel and disk cache fetching and clearing
Modified: branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp (239780 => 239781)
--- branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp 2019-01-09 20:05:09 UTC (rev 239780)
+++ branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp 2019-01-09 20:47:11 UTC (rev 239781)
@@ -46,7 +46,9 @@
#if PLATFORM(COCOA)
if (networkHTTPSUpgradeCheckerDatabasePath.get().isNull()) {
CFBundleRef webKitBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"));
- networkHTTPSUpgradeCheckerDatabasePath.get() = CFURLGetString(adoptCF(CFBundleCopyResourceURL(webKitBundle, CFSTR("HTTPSUpgradeList"), CFSTR("db"), nullptr)).get());
+ auto resourceURL = adoptCF(CFBundleCopyResourceURL(webKitBundle, CFSTR("HTTPSUpgradeList"), CFSTR("db"), nullptr));
+ if (resourceURL)
+ networkHTTPSUpgradeCheckerDatabasePath.get() = CFURLGetString(resourceURL.get());
}
#endif // PLATFORM(COCOA)
return networkHTTPSUpgradeCheckerDatabasePath;
@@ -61,7 +63,10 @@
m_workQueue->dispatch([this] {
auto path = networkHTTPSUpgradeCheckerDatabasePath();
- ASSERT(path);
+ if (path.isEmpty()) {
+ RELEASE_LOG_ERROR(Network, "%p - NetworkHTTPSUpgradeChecker failed to initialize because the database path is empty", this);
+ return;
+ }
bool isDatabaseOpen = m_database->open(path);
if (!isDatabaseOpen) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
