Resolve possible double memory free.

This patch prevent grid item remove
callback from deleting already deleted
icon path.

Change-Id: Id66e577090acbc82336782d7693a0ce76c8660b1

diff --git a/src/attach_panel.c b/src/attach_panel.c
index cf46d0cbd338352d75a903add2507e2ffa7a4a17..8f64d623d4e6f992fa547dc77f4823c9c96bc19a 100755 (executable)
--- a/src/attach_panel.c
+++ b/src/attach_panel.c
@@ -695,7 +695,10 @@ EXPORT_API int attach_panel_set_extra_data(attach_panel_h attach_panel, attach_p
                _bundle_add_to_app_control(content_info->extra_data, app_control);
                if (ATTACH_PANEL_STATE_FULL == _gesture_get_state()) {
                        app_control_remove_extra_data(app_control, APP_CONTROL_DATA_SELECTION_MODE);
-                       app_control_add_extra_data(app_control, APP_CONTROL_DATA_SELECTION_MODE, SELECTION_MODE_MULTIPLE);
+                       ret = app_control_add_extra_data(app_control, APP_CONTROL_DATA_SELECTION_MODE, SELECTION_MODE_MULTIPLE);
+                       if (ret != APP_CONTROL_ERROR_NONE) {
+                               _E("Fail to add extra data");
+                       }
                }
                ug_send_message(ui_gadget, app_control);
                ret = app_control_destroy(app_control);

diff --git a/src/grid.c b/src/grid.c
index 8f622f2e3b0728e638b95591562280d07750dbf4..d5e26040172d4a2718e41cd15461cfa16afe9a85 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -214,13 +214,7 @@ static Evas_Object *__content_get(void *data, Evas_Object *obj, const char *part
 
 static void __del(void *data, Evas_Object *obj)
 {
-       content_s* info = data;
        ret_if(NULL == data);
-
-       if (info->icon_path) {
-               free(info->icon_path);
-               info->icon_path = NULL;
-       }
 }