Changeset 220677 in webkit

Timestamp:

Aug 14, 2017 4:12:23 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK][WPE] Crash in IconDatabase::IconRecord::setImageData()
​https://bugs.webkit.org/show_bug.cgi?id=175527

Reviewed by Žan Doberšek.

The problem is that when setImageData() is called from IconDatabase::readFromDatabase() the shared buffer might
be nullptr, because getImageDataForIconURLFromSQLDatabase() returns nullptr if the icon data is not in the database.

• UIProcess/API/glib/IconDatabase.cpp:

(WebKit::IconDatabase::IconRecord::setImageData): Return early if passed in buffer is nullptr.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/glib/IconDatabase.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-08-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][WPE] Crash in IconDatabase::IconRecord::setImageData()
+        https://bugs.webkit.org/show_bug.cgi?id=175527
+
+        Reviewed by Žan Doberšek.
+
+        The problem is that when setImageData() is called from IconDatabase::readFromDatabase() the shared buffer might
+        be nullptr, because getImageDataForIconURLFromSQLDatabase() returns nullptr if the icon data is not in the database.
+
+        * UIProcess/API/glib/IconDatabase.cpp:
+        (WebKit::IconDatabase::IconRecord::setImageData): Return early if passed in buffer is nullptr.
+
 2017-08-14  Zan Dobersek  <zdobersek@igalia.com>
 

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

@@ -121 +121 @@
     m_image = nullptr;
 
-    if (!m_imageData->size()) {
+    if (!m_imageData || !m_imageData->size()) {
         m_imageData = nullptr;
         return;