From 413825eec7a868c0924d2aeb9b38cfd3a2142053 Mon Sep 17 00:00:00 2001 From: "bhutani.92" Date: Fri, 2 Dec 2016 17:36:48 +0530 Subject: [PATCH] Fixed TSAM-10465 Sound Player Crash Change-Id: I75c396705b5c3d7ef000ba9ef9cd0789e1ead524 Signed-off-by: bhutani.92 --- src/common/mp-common.c | 2 +- src/common/mp-edit-callback.c | 1 - src/common/mp-media-info.c | 6 ++++-- src/widget/mp-lyric.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/mp-common.c b/src/common/mp-common.c index 98994bf..f4d90a6 100644 --- a/src/common/mp-common.c +++ b/src/common/mp-common.c @@ -1571,10 +1571,10 @@ _mp_common_view_by_folder(const char *path, app_control_h app_control) if (!cur && !g_strcmp0(path, file_path)) { cur = item; } - IF_FREE(file_path); } eina_list_free(file_list); file_list = NULL; + IF_FREE(file_path); } } diff --git a/src/common/mp-edit-callback.c b/src/common/mp-edit-callback.c index 0a7b374..fae2abd 100644 --- a/src/common/mp-edit-callback.c +++ b/src/common/mp-edit-callback.c @@ -190,7 +190,6 @@ mp_edit_create_add_to_playlist_popup(void *data) popup = mp_genlist_popup_create(ad->win_main, MP_POPUP_ADD_TO_PLST, data, ad); mp_retm_if(!popup, "popup is NULL !!!"); - //mp_genlist_popup_item_append(popup, GET_STR("IDS_MUSIC_OPT_CREATE_PLAYLIST"), NULL, NULL, NULL, _mp_edit_cb_create_playlist_cb, data); mp_popup_response_callback_set(popup, _mp_edit_cb_create_playlist_cb, data); int i = 0, count = -1, ret = -1; diff --git a/src/common/mp-media-info.c b/src/common/mp-media-info.c index 52c9a28..436cbd9 100644 --- a/src/common/mp-media-info.c +++ b/src/common/mp-media-info.c @@ -768,8 +768,10 @@ int mp_media_info_list_create_w_filter(mp_track_type_e track_type, const char *f return res; } - (*media_list)->list = g_list_reverse((*media_list)->list); - (*media_list)->count = g_list_length((*media_list)->list); + if ((*media_list)->list) { + (*media_list)->list = g_list_reverse((*media_list)->list); + (*media_list)->count = g_list_length((*media_list)->list); + } return res; } diff --git a/src/widget/mp-lyric.c b/src/widget/mp-lyric.c index ce59421..98823d5 100644 --- a/src/widget/mp-lyric.c +++ b/src/widget/mp-lyric.c @@ -209,7 +209,7 @@ _mp_lyric_set_line_color(MpLyricData_t *wd, Evas_Object *obj, int index, const c edje_object_part_text_set(_EDJ(obj), "txt", text_new); - free(text_new); + IF_FREE(text_new); } -- 2.34.1