Title: [148456] trunk/Source/WebKit/win
- Revision
- 148456
- Author
- commit-qu...@webkit.org
- Date
- 2013-04-15 12:32:45 -0700 (Mon, 15 Apr 2013)
Log Message
Crash when favicon is requested
https://bugs.webkit.org/show_bug.cgi?id=114624
Patch by pe...@outlook.com <pe...@outlook.com> on 2013-04-15
Reviewed by Brent Fulgham.
* WebIconDatabase.cpp:
(WebIconDatabase::getOrCreateDefaultIconBitmap): Added NULL pointer check.
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (148455 => 148456)
--- trunk/Source/WebKit/win/ChangeLog 2013-04-15 19:04:10 UTC (rev 148455)
+++ trunk/Source/WebKit/win/ChangeLog 2013-04-15 19:32:45 UTC (rev 148456)
@@ -1,3 +1,13 @@
+2013-04-15 pe...@outlook.com <pe...@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 <ander...@apple.com>
All tests crash on Windows
Modified: trunk/Source/WebKit/win/WebIconDatabase.cpp (148455 => 148456)
--- trunk/Source/WebKit/win/WebIconDatabase.cpp 2013-04-15 19:04:10 UTC (rev 148455)
+++ trunk/Source/WebKit/win/WebIconDatabase.cpp 2013-04-15 19:32:45 UTC (rev 148456)
@@ -307,7 +307,7 @@
result = createDIB(size);
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;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
