Changeset 148097 in webkit

Timestamp:

Apr 10, 2013 9:13:35 AM (11 years ago)

Author:

rakuco@webkit.org

Message:

REGRESSION(r148034): IconDatabase::updateIconRecord crashes with null iconData and iconBitmap.
​https://bugs.webkit.org/show_bug.cgi?id=114356

Reviewed by Tim Horton.

When loading an icon fails (for example, when a non-existent URI is
passed to the loader), updateIconRecord can be called with both
iconData and iconBitmap having no data.

This used to be fine before r148034, but causes an assertion now.

No new tests, existing tests such as fast/encoding/mispositioned-meta.html
were crashing.

• loader/icon/IconDatabase.cpp:

(WebCore::IconDatabase::updateIconRecord): Change the ASSERT() to check
for a NAND condition that only fails if both iconData and iconBitmap
are not 0.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/icon/IconDatabase.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-10  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
+
+        REGRESSION(r148034): IconDatabase::updateIconRecord crashes with null iconData and iconBitmap.
+        https://bugs.webkit.org/show_bug.cgi?id=114356
+
+        Reviewed by Tim Horton.
+
+        When loading an icon fails (for example, when a non-existent URI is
+        passed to the loader), updateIconRecord can be called with both
+        iconData and iconBitmap having no data.
+
+        This used to be fine before r148034, but causes an assertion now.
+
+        No new tests, existing tests such as fast/encoding/mispositioned-meta.html
+        were crashing.
+
+        * loader/icon/IconDatabase.cpp:
+        (WebCore::IconDatabase::updateIconRecord): Change the ASSERT() to check
+        for a NAND condition that only fails if both iconData and iconBitmap
+        are not 0.
+
 2013-04-10  JungJik Lee  <jungjik.lee@samsung.com>
 

trunk/Source/WebCore/loader/icon/IconDatabase.cpp

@@ -538 +538 @@
 void IconDatabase::updateIconRecord(PassRefPtr<SharedBuffer> iconData, PassRefPtr<Image> iconBitmap, const String& iconURL)
 {
-    // Only one of iconData or iconBitmap should be provided, never both.
-    ASSERT(!iconData != !iconBitmap);
+    // Only one of iconData or iconBitmap should be provided, never both. None is also fine.
+    ASSERT(!(!!iconData && !!iconBitmap));
 
     Vector<String> pageURLs;