Changeset 92808 in webkit

Timestamp:

Aug 10, 2011, 5:54:42 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Return from _ewk_view_smart_add if smart data can not be allocated
​https://bugs.webkit.org/show_bug.cgi?id=65853

Patch by Grzegorz Czajkowski <​g.czajkowski@samsung.com> on 2011-08-10
Reviewed by Kenneth Rohde Christiansen.

It prevents the crash while allocating a memory for view's smart data.
Others checking are needed for support single and tiled backing store.
As a result an empty window will be displayed.

• ewk/ewk_view.cpp:

(_ewk_view_smart_add):
(_ewk_view_smart_resize):
(_ewk_view_smart_move):
(_ewk_view_smart_show):
(_ewk_view_smart_hide):

• ewk/ewk_view_single.c:

(_ewk_view_single_smart_add):
(_ewk_view_single_smart_resize):

• ewk/ewk_view_tiled.c:

(_ewk_view_tiled_smart_add):

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_view.cpp (modified) (5 diffs)
• ewk/ewk_view_single.c (modified) (2 diffs)
• ewk/ewk_view_tiled.c (modified) (1 diff)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-08-10  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        [EFL] Return from _ewk_view_smart_add if smart data can not be allocated
+        https://bugs.webkit.org/show_bug.cgi?id=65853
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        It prevents the crash while allocating a memory for view's smart data.
+        Others checking are needed for support single and tiled backing store.
+        As a result an empty window will be displayed.
+
+        * ewk/ewk_view.cpp:
+        (_ewk_view_smart_add):
+        (_ewk_view_smart_resize):
+        (_ewk_view_smart_move):
+        (_ewk_view_smart_show):
+        (_ewk_view_smart_hide):
+        * ewk/ewk_view_single.c:
+        (_ewk_view_single_smart_add):
+        (_ewk_view_single_smart_resize):
+        * ewk/ewk_view_tiled.c:
+        (_ewk_view_tiled_smart_add):
+
 2011-08-10  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
 

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -708 +708 @@
     if (!sd) {
         sd = (Ewk_View_Smart_Data *)calloc(1, sizeof(Ewk_View_Smart_Data));
-        if (!sd)
+        if (!sd) {
             CRITICAL("could not allocate Ewk_View_Smart_Data");
-        else
-            evas_object_smart_data_set(o, sd);
+            return;
+        }
+        evas_object_smart_data_set(o, sd);
     }
 
@@ -789 +790 @@
 static void _ewk_view_smart_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h)
 {
-    EWK_VIEW_SD_GET(o, sd);
+    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
 
     // these should be queued and processed in calculate as well!
@@ -800 +801 @@
 static void _ewk_view_smart_move(Evas_Object *o, Evas_Coord x, Evas_Coord y)
 {
-    EWK_VIEW_SD_GET(o, sd);
+    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     sd->changed.position = EINA_TRUE;
     _ewk_view_smart_changed(sd);
@@ -871 +872 @@
 static void _ewk_view_smart_show(Evas_Object *o)
 {
-    EWK_VIEW_SD_GET(o, sd);
+    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
 
     if (evas_object_clipees_get(sd->base.clipper))
@@ -880 +881 @@
 static void _ewk_view_smart_hide(Evas_Object *o)
 {
-    EWK_VIEW_SD_GET(o, sd);
+    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
 
     evas_object_hide(sd->base.clipper);

trunk/Source/WebKit/efl/ewk/ewk_view_single.c

@@ -44 +44 @@
 
     sd = (Ewk_View_Smart_Data *)evas_object_smart_data_get(o);
+    if (!sd)
+        return;
 
     Evas_Object *clip = evas_object_rectangle_add(sd->base.evas);
@@ -67 +69 @@
     Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data*)evas_object_smart_data_get(o);
     _parent_sc.sc.resize(o, w, h);
+
+    if (!sd)
+        return;
 
     // these should be queued and processed in calculate as well!

trunk/Source/WebKit/efl/ewk/ewk_view_tiled.c

@@ -72 +72 @@
 
     sd = (Ewk_View_Smart_Data*)evas_object_smart_data_get(o);
+    if (!sd)
+        return;
+
     evas_object_smart_callback_add(
         sd->main_frame, "contents,size,changed",