From: Jaeun Choi Date: Sun, 17 Jul 2016 03:07:22 +0000 (+0900) Subject: elm_win: null out freed data on smart del X-Git-Tag: submit/tizen/20160720.122528~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e3d4930bc708f770d7798e8a6c8e81786faa44d;p=platform%2Fupstream%2Felementary.git elm_win: null out freed data on smart del this fixes double-frees of strings in oddball cases where a deleted window that is not done deleting is accessed. Change-Id: I40e308d5b43b013134859ac5ca3a82018af5e48a Signed-off-by: Jaeun Choi Origin: upstream --- diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index b0da8e1fa..187531eec 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -2217,10 +2217,19 @@ _elm_win_evas_object_smart_del(Eo *obj, Elm_Win_Data *sd) evas_object_del(sd->icon); evas_object_del(sd->main_menu); + sd->focus_highlight.style = NULL; + sd->title = NULL; + sd->icon_name = NULL; + sd->role = NULL; + sd->name = NULL; + sd->icon = NULL; + sd->main_menu = NULL; + _elm_win_profile_del(sd); _elm_win_available_profiles_del(sd); free(sd->wm_rot.rots); + sd->wm_rot.rots = NULL; /* Don't let callback in the air that point to sd */ ecore_evas_callback_delete_request_set(sd->ee, NULL);