Changeset 232397 in webkit

Timestamp:

Jun 1, 2018 9:12:14 AM (6 years ago)

Author:

Michael Catanzaro

Message:

[GTK] Crash in WebKitFaviconDatabase when pageURL is unset
​https://bugs.webkit.org/show_bug.cgi?id=186164

Reviewed by Carlos Garcia Campos.

PageURL can legitimately be null here if JavaScript does something silly with window.open.

• UIProcess/API/glib/WebKitFaviconDatabase.cpp:

(webkitFaviconDatabaseSetIconURLForPageURL):
(webkitFaviconDatabaseSetIconForPageURL):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/glib/WebKitFaviconDatabase.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-06-01  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GTK] Crash in WebKitFaviconDatabase when pageURL is unset
+        https://bugs.webkit.org/show_bug.cgi?id=186164
+
+        Reviewed by Carlos Garcia Campos.
+
+        PageURL can legitimately be null here if JavaScript does something silly with window.open.
+
+        * UIProcess/API/glib/WebKitFaviconDatabase.cpp:
+        (webkitFaviconDatabaseSetIconURLForPageURL):
+        (webkitFaviconDatabaseSetIconForPageURL):
+
 2018-05-31  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp

@@ -193 +193 @@
         return;
 
+    if (pageURL.isEmpty())
+        return;
+
     const String& currentIconURL = priv->pageURLToIconURLMap.get(pageURL);
     if (iconURL == currentIconURL)
@@ -317 +320 @@
         return;
 
+    if (pageURL.isEmpty())
+        return;
+
     WebKitFaviconDatabasePrivate* priv = database->priv;
     SetForScope<bool> change(priv->isSettingIcon, true);