Attachment 358712 Details for Bug 193285 – Patch

[patch] Patch

bug-193285-20190109095144.patch (text/plain), 2.39 KB, created by Chris Dumez on 2019-01-09 09:51:47 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2019-01-09 09:51:47 PST

Size: 2.39 KB

patch

obsolete

>Subversion Revision: 239773
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 891a4f5f895eadbe11fc3e45d24f21f0b5014564..6edd1a1d04e1f737f9dbdd6bc1fa220118648634 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-01-09  Chris Dumez  <cdumez@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 NOBODY (OOPS!).
>+
>+        * NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
>+        (WebKit::networkHTTPSUpgradeCheckerDatabasePath):
>+        (WebKit::NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker):
>+
> 2019-01-09  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [GTK] Add missing autocleanups
>diff --git a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp
>index eeb8d1ffd3ee7926a332d7ecd57436ed575d3867..7931d618fc836f070382bb9d2ff20003ac43bd03 100644
>--- a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp
>@@ -46,7 +46,9 @@ static const String& networkHTTPSUpgradeCheckerDatabasePath()
> #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 @@ NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker()
> 
>     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) {

Actions: View | Formatted Diff | Diff

Attachments on bug 193285: 358712