Attachment 341696 Details for Bug 186164 – Patch

[patch] Patch

bug-186164-20180531170525.patch (text/plain), 1.88 KB, created by Michael Catanzaro on 2018-05-31 15:05:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2018-05-31 15:05:26 PDT

Size: 1.88 KB

patch

obsolete

>Subversion Revision: 232297
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 4f7edf0a844bd35c5f9c428be8e5819816c2e6bb..b884c6c496462061bd8c2718e6f42cab09992633 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-31  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [GTK] Crash in WebKitFaviconDatabase when pageURL is unset
>+        https://bugs.webkit.org/show_bug.cgi?id=186164
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        PageURL can legitimately be null here if JavaScript does something silly with window.open.
>+
>+        * UIProcess/API/glib/WebKitFaviconDatabase.cpp:
>+        (webkitFaviconDatabaseSetIconURLForPageURL):
>+        (webkitFaviconDatabaseSetIconForPageURL):
>+
> 2018-05-29  Tim Horton  <timothy_horton@apple.com>
> 
>         Fix the build
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp b/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp
>index 372443e2d3bc121f54d876b54be413de0cecc6d2..adb39007e705e676363a8aa2b3df6aa537c56f3e 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp
>@@ -192,6 +192,9 @@ static void webkitFaviconDatabaseSetIconURLForPageURL(WebKitFaviconDatabase* dat
>     if (!priv->isURLImportCompleted)
>         return;
> 
>+    if (pageURL.isEmpty())
>+        return;
>+
>     const String& currentIconURL = priv->pageURLToIconURLMap.get(pageURL);
>     if (iconURL == currentIconURL)
>         return;
>@@ -316,6 +319,9 @@ void webkitFaviconDatabaseSetIconForPageURL(WebKitFaviconDatabase* database, con
>     if (!webkitFaviconDatabaseIsOpen(database))
>         return;
> 
>+    if (pageURL.isEmpty())
>+        return;
>+
>     WebKitFaviconDatabasePrivate* priv = database->priv;
>     SetForScope<bool> change(priv->isSettingIcon, true);
>     priv->iconDatabase->setIconURLForPageURL(icon.url.string(), pageURL);

Actions: View | Formatted Diff | Diff

Attachments on bug 186164: 341696 | 341727