Changeset 148456 in webkit

Timestamp:

Apr 15, 2013 12:32:45 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Crash when favicon is requested
​https://bugs.webkit.org/show_bug.cgi?id=114624

Patch by ​peavo@outlook.com <​peavo@outlook.com> on 2013-04-15
Reviewed by Brent Fulgham.

• WebIconDatabase.cpp:

(WebIconDatabase::getOrCreateDefaultIconBitmap): Added NULL pointer check.

Location:

trunk/Source/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebIconDatabase.cpp (modified) (1 diff)

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2013-04-15  peavo@outlook.com  <peavo@outlook.com>
+
+        Crash when favicon is requested
+        https://bugs.webkit.org/show_bug.cgi?id=114624
+
+        Reviewed by Brent Fulgham.
+
+        * WebIconDatabase.cpp:
+        (WebIconDatabase::getOrCreateDefaultIconBitmap): Added NULL pointer check.
+
 2013-04-12  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/win/WebIconDatabase.cpp

@@ -308 +308 @@
 
     m_defaultIconMap.set(*size, result);
-    if (!iconDatabase().defaultIcon(*size)->getHBITMAPOfSize(result, size)) {
+    if (!iconDatabase().defaultIcon(*size) || !iconDatabase().defaultIcon(*size)->getHBITMAPOfSize(result, size)) {
         LOG_ERROR("Failed to draw Image to HBITMAP");
         return 0;