Title: [232397] trunk/Source/WebKit
- Revision
- 232397
- Author
- mcatanz...@igalia.com
- Date
- 2018-06-01 09:12:14 -0700 (Fri, 01 Jun 2018)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (232396 => 232397)
--- trunk/Source/WebKit/ChangeLog 2018-06-01 16:08:18 UTC (rev 232396)
+++ trunk/Source/WebKit/ChangeLog 2018-06-01 16:12:14 UTC (rev 232397)
@@ -1,3 +1,16 @@
+2018-06-01 Michael Catanzaro <mcatanz...@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 <bb...@apple.com>
[Cocoa] Web Automation: use the session delegate to perform window maximize
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp (232396 => 232397)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp 2018-06-01 16:08:18 UTC (rev 232396)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp 2018-06-01 16:12:14 UTC (rev 232397)
@@ -192,6 +192,9 @@
if (!priv->isURLImportCompleted)
return;
+ if (pageURL.isEmpty())
+ return;
+
const String& currentIconURL = priv->pageURLToIconURLMap.get(pageURL);
if (iconURL == currentIconURL)
return;
@@ -316,6 +319,9 @@
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);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
