Title: [121253] trunk/Source/WebCore
Revision
121253
Author
[email protected]
Date
2012-06-26 04:27:55 -0700 (Tue, 26 Jun 2012)

Log Message

[EFL] REGRESSION (r121163): fast/frames/iframe-access-screen-of-deleted.html crashes
https://bugs.webkit.org/show_bug.cgi?id=89964

Patch by Thiago Marcos P. Santos <[email protected]> on 2012-06-26
Reviewed by Andreas Kling.

Added missing null pointer check.

* platform/efl/PlatformScreenEfl.cpp:
(WebCore::screenDepth):
(WebCore::screenDepthPerComponent):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (121252 => 121253)


--- trunk/Source/WebCore/ChangeLog	2012-06-26 10:36:21 UTC (rev 121252)
+++ trunk/Source/WebCore/ChangeLog	2012-06-26 11:27:55 UTC (rev 121253)
@@ -1,3 +1,16 @@
+2012-06-26  Thiago Marcos P. Santos  <[email protected]>
+
+        [EFL] REGRESSION (r121163): fast/frames/iframe-access-screen-of-deleted.html crashes
+        https://bugs.webkit.org/show_bug.cgi?id=89964
+
+        Reviewed by Andreas Kling.
+
+        Added missing null pointer check.
+
+        * platform/efl/PlatformScreenEfl.cpp:
+        (WebCore::screenDepth):
+        (WebCore::screenDepthPerComponent):
+
 2012-06-26  Taiju Tsuiki  <[email protected]>
 
         Web Inspector: Add requestMetadata command and metadataReceived event to FileSystem

Modified: trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp (121252 => 121253)


--- trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp	2012-06-26 10:36:21 UTC (rev 121252)
+++ trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp	2012-06-26 11:27:55 UTC (rev 121253)
@@ -58,7 +58,7 @@
 
 int screenDepth(Widget* widget)
 {
-    if (!widget->evas())
+    if (!widget || !widget->evas())
         return 0;
 
     return getPixelDepth(widget->evas());
@@ -66,7 +66,7 @@
 
 int screenDepthPerComponent(Widget* widget)
 {
-    if (!widget->evas())
+    if (!widget || !widget->evas())
         return 0;
 
     // FIXME: How to support this functionality based on EFL library ?
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to