Fixed SVACE Errors

Change-Id: I25d98a1d8a58f8fc02b8c145964efbbc13a64e6d
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>

diff --git a/src/common/mp-common.c b/src/common/mp-common.c
index 6648c217da3a1ed5bcbe8b083982b132a39c1366..6acf9e4d6fef965cf67484db2b946f44de0c66f7 100755 (executable)
--- a/src/common/mp-common.c
+++ b/src/common/mp-common.c
@@ -1080,6 +1080,7 @@ mp_common_show_player_view(int launch_type, bool disable_effect, bool start_play
 
        if (start_playback) {
                struct appdata *ad = mp_util_get_appdata();
+               MP_CHECK(ad);
                player_view->start_on_transition_finish = true;
                ad->player_state = PLAY_STATE_PLAYING;
        }

diff --git a/src/common/mp-edit-callback.c b/src/common/mp-edit-callback.c
index 4386598464f36509206a342b5b7a5d57d98a5c10..fa6831c4a6d1603ab9fc3439840a3ffc60320489 100755 (executable)
--- a/src/common/mp-edit-callback.c
+++ b/src/common/mp-edit-callback.c
@@ -153,6 +153,9 @@ _mp_edit_cb_add_to_playlist_cb(void *data, Evas_Object * obj, void *event_info)
 
        Elm_Object_Item *selected_item = event_info;
        Popup_genlist_item *gli_data = (Popup_genlist_item *)elm_object_item_data_get(selected_item);
+       if (!gli_data) {
+               return;
+       }
 
        char *playlist_name;
        mp_media_info_h item = data;

diff --git a/src/common/mp-widget.c b/src/common/mp-widget.c
index 213ace7e1bb20c3effaf34aed1c956cfabe3c69e..a5bee76a43c27c4342a58f2257968a851eaba46a 100755 (executable)
--- a/src/common/mp-widget.c
+++ b/src/common/mp-widget.c
@@ -82,6 +82,7 @@ EXPORT_API Evas_Object *
 mp_widget_text_popup(void *data, const char *message)
 {
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK_NULL(ad);
        Evas_Object *popup = NULL;
        popup = mp_popup_create(ad->win_main, MP_POPUP_NOTIFY, NULL, ad, _mp_widget_text_popup_timeout_cb, ad);
 
@@ -99,6 +100,7 @@ EXPORT_API Evas_Object *
 mp_widget_text_popup_show(void *data, const char *message, bool show)
 {
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK_NULL(ad);
        Evas_Object *popup = NULL;
        popup = mp_popup_create(ad->win_main, MP_POPUP_NOTIFY, NULL, ad, _mp_widget_text_popup_timeout_cb, ad);
 
@@ -136,6 +138,7 @@ EXPORT_API Evas_Object *
 mp_widget_text_cb_popup(void *data, const char *message, Evas_Smart_Cb cb)
 {
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK_NULL(ad);
        Evas_Object *popup = NULL;
        popup = mp_popup_create(ad->win_main, MP_POPUP_NOTIFY, NULL, ad, cb, ad);
 

diff --git a/src/core/mp-player-control.c b/src/core/mp-player-control.c
index 9dcd83fd1312a5b7c5185fdfcb016798519e30c6..e720e8628dc5027699d37c785b03a536a87523ae 100755 (executable)
--- a/src/core/mp-player-control.c
+++ b/src/core/mp-player-control.c
@@ -817,6 +817,7 @@ mp_play_control_menu_cb(void *data, Evas_Object * o, const char *emission, const
 {
        eventfunc;
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK(ad);
        EVENT_TRACE("mp_play_control_menu_cb with[%s]\n", emission);
 
        if (!strcmp(emission, SIGNAL_SHUFFLE_ON)) {                     /* TURN OFF SHUFFLE */

diff --git a/src/core/mp-player-mgr.c b/src/core/mp-player-mgr.c
index 6d6263e227d041e787ee1911f5fcf3095b729fde..1d91a923edb435346b9d8c2576b69e45a4a6f797 100755 (executable)
--- a/src/core/mp-player-mgr.c
+++ b/src/core/mp-player-mgr.c
@@ -1179,6 +1179,7 @@ bool
 mp_player_mgr_session_init(void)
 {
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK_FALSE(ad);
        int ret = SOUND_MANAGER_ERROR_NONE;
        if (!ad->stream_info) {
                ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_MEDIA, mp_player_focus_callback, ad, &ad->stream_info);

diff --git a/src/core/mp-setting-ctrl.c b/src/core/mp-setting-ctrl.c
index 45c70c7c5311f29dbb63eaf0de8a53866f9cb7ab..c82e0260b795491c0cc9a04ef7e8f8cf3552e742 100755 (executable)
--- a/src/core/mp-setting-ctrl.c
+++ b/src/core/mp-setting-ctrl.c
@@ -1083,9 +1083,14 @@ mp_setting_update_active_device()
 
 int mp_setting_get_side_sync_status(void)
 {
-       int ret = 0;
+       int ret = -1;
        if (!g_setting) {
-               ret = mp_setting_init(mp_util_get_appdata());
+               struct appdata *ad = mp_util_get_appdata();
+               MP_CHECK_VAL(ad, -1);
+               ret = mp_setting_init(ad);
+               if (ret == -1) {
+                       return ret;
+               }
        }
 
        return g_setting->side_sync_status;

diff --git a/src/core/mp-view-mgr.c b/src/core/mp-view-mgr.c
index a455a740a8dee942e2c1d78566d2f50e9083224d..863852a3d074a81e453b7b9e5b709202abec9d42 100755 (executable)
--- a/src/core/mp-view-mgr.c
+++ b/src/core/mp-view-mgr.c
@@ -42,6 +42,9 @@ static void _print_view_stack()
        Elm_Object_Item *data = NULL;
        EINA_LIST_FOREACH(list, l, data) {
                MpView_t *view = elm_object_item_data_get(data);
+               if (!view) {
+                       continue;
+               }
                WARN_TRACE("view[0x%x], depth[%d], type[%d]", view, i, view->view_type);
                i++;
        }
@@ -139,6 +142,7 @@ MpViewMgr_t *mp_view_mgr_create(Evas_Object *parent)
        view_mgr->navi = mp_widget_navigation_new(parent);
 
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK_NULL(ad);
        evas_object_event_callback_add(ad->win_main, EVAS_CALLBACK_RESIZE, _mp_view_mgr_win_resize_cb, view_mgr->navi);
 
        eext_object_event_callback_add(view_mgr->navi, EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL);
@@ -185,6 +189,9 @@ EXPORT_API MpView_t *mp_view_mgr_get_view(MpViewMgr_t *view_mgr, MpViewType_e ty
        Elm_Object_Item *data = NULL;
        EINA_LIST_FOREACH(list, l, data) {
                view = elm_object_item_data_get(data);
+               if (!view) {
+                       continue;
+               }
                if (view->view_type == type) {
                        break;
                }
@@ -206,6 +213,9 @@ EXPORT_API MpView_t *mp_view_mgr_get_view_prev(MpViewMgr_t *view_mgr, MpViewType
        MpView_t *prev_view = NULL;
        EINA_LIST_FOREACH(list, l, data) {
                view = elm_object_item_data_get(data);
+               if (!view) {
+                       return NULL;
+               }
                if (view->view_type == type) {
                        break;
                }
@@ -265,7 +275,9 @@ EXPORT_API int mp_view_mgr_push_view_with_effect(MpViewMgr_t *view_mgr, MpView_t
        _print_view_stack();
 
 #ifndef MP_SOUND_PLAYER
-       if (mp_util_get_appdata()->current_track_info) {
+       struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK_VAL(ad, -1);
+       if (ad->current_track_info) {
                mp_view_set_nowplaying(view);
                mp_view_update_nowplaying(view, true);
        }
@@ -304,6 +316,7 @@ int mp_view_mgr_pop_view(MpViewMgr_t *view_mgr, bool pop_view)
        if (!list) {
                DEBUG_TRACE("There is no previous view..");
                struct appdata *ad = mp_util_get_appdata();
+               MP_CHECK_VAL(ad, -1);
                elm_win_lower(ad->win_main);
                ecore_idler_add(_create_main_view_cb, ad);
                goto END;

diff --git a/src/mp-main.c b/src/mp-main.c
index 3cadb76e131deb31f06e85d19ffea7aa61f53844..85a5165be70fae332b952acd9f03f88f4507088c 100755 (executable)
--- a/src/mp-main.c
+++ b/src/mp-main.c
@@ -972,6 +972,7 @@ _mp_main_parse_livebox_event(app_control_h app_control, bool *activate_window, b
        char *value = NULL;
 
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK_VAL(ad, -1);
 
        if (!app_control_get_extra_data(app_control, MP_LB_EVENT_KEY, &value)) {
                *activate_window = false;

diff --git a/src/view/mp-edit-view.c b/src/view/mp-edit-view.c
index 0519008c2d28ec780c644bc17a6ab17f3363ed91..1f881ace7af58f04dedf06c37e6955cef96b564c 100755 (executable)
--- a/src/view/mp-edit-view.c
+++ b/src/view/mp-edit-view.c
@@ -85,6 +85,7 @@ static Eina_Bool _mp_edit_view_back_cb(void *data, Elm_Object_Item *it)
        MP_CHECK_VAL(view, EINA_TRUE);
 
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK_FALSE(ad);
        ad->del_cb_invoked = 0;
 
        /*

diff --git a/src/view/mp-now-playing-list-view.c b/src/view/mp-now-playing-list-view.c
index b251cc0766cee9ce15a98bd56ea72ccee45b5970..ffe75c0a67a2b23b1130adc22f9f3d717b21931d 100755 (executable)
--- a/src/view/mp-now-playing-list-view.c
+++ b/src/view/mp-now-playing-list-view.c
@@ -108,6 +108,7 @@ _mp_now_playing_list_view_remove_popup_show(MpNowPlayingListiew_t *view)
 {
        DEBUG_TRACE("");
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK(ad);
 
        MpList_t *list = view->content_to_show;
        MP_CHECK(list);

diff --git a/src/view/mp-player-view.c b/src/view/mp-player-view.c
index eca0b59be585510a31f0a9410e0b010071324bd8..783b677f215406aa5c856af86c94a4121b9e8582 100755 (executable)
--- a/src/view/mp-player-view.c
+++ b/src/view/mp-player-view.c
@@ -425,6 +425,7 @@ static void _mp_player_view_update_control_queue_list_btn(void *data)
        MP_CHECK(view->navi_it);
 
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK(ad);
        Evas_Object *image = elm_object_content_get(view->option_button[OPTION_QUEUE]);
 
        char mp_image_path[1024] = {0};
@@ -1392,6 +1393,7 @@ static int _mp_player_view_update_options(void *thiz)
        MP_CHECK_FALSE(playing_view);
 
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK_VAL(ad, -1);
        mp_plst_item *item = mp_playlist_mgr_get_current(ad->playlist_mgr);
        if (item == NULL) {
                if (ad->current_track_info) {

diff --git a/src/view/mp-search-view.c b/src/view/mp-search-view.c
index 4a05fee32131113d911388c66b2230f722eeb873..e672ae002e4248208e71fa293a1df0891d967f69 100755 (executable)
--- a/src/view/mp-search-view.c
+++ b/src/view/mp-search-view.c
@@ -247,6 +247,7 @@ _mp_search_view_on_event_cb(void *thiz, MpViewEvent_e event)
                if ((int)mp_view_mgr_get_top_view(GET_VIEW_MGR) ==
                        (int)view) {
                        struct appdata *ad = mp_util_get_appdata();
+                       MP_CHECK(ad);
                        if (ad->sip_state) {
                                elm_object_focus_allow_set(
                                    mp_search_entry_get(view->search_bar),

diff --git a/src/view/mp-set-as-view.c b/src/view/mp-set-as-view.c
index a1e0cd6d6bc79a35a7abf0cc50a728a84d83011a..19cab3004973aa2fd5f2bbacb3ea1098bc32f301 100755 (executable)
--- a/src/view/mp-set-as-view.c
+++ b/src/view/mp-set-as-view.c
@@ -508,6 +508,7 @@ static void _gl_sel(void *data, Evas_Object *obj, void *event_info)
 
                /*pause the main player*/
                struct appdata *ad = mp_util_get_appdata();
+               MP_CHECK(ad);
                if (ad->player_state == PLAY_STATE_PLAYING) {
                        view->need_to_resume = TRUE;
                        mp_play_control_play_pause(ad, FALSE);

diff --git a/src/view/mp-view.c b/src/view/mp-view.c
index 89154b53dcb303e47a63306e8c851eda206a4667..8e91fd7f779424af76cc50014ea6fbca78a324e5 100755 (executable)
--- a/src/view/mp-view.c
+++ b/src/view/mp-view.c
@@ -209,6 +209,7 @@ static int _mp_view_set_nowplaying(void *thiz)
        }
 
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK_VAL(ad, -1);
        if (!ad->current_track_info) {
                return 0;
        }

diff --git a/src/widget/mp-edit-playlist.c b/src/widget/mp-edit-playlist.c
index 04fb083451432f28daeafd09e50a763d00ce81fb..52c9847c8b74094a0c59403b3d77da70192d4ca4 100755 (executable)
--- a/src/widget/mp-edit-playlist.c
+++ b/src/widget/mp-edit-playlist.c
@@ -44,6 +44,7 @@ _mp_edit_playlist_destory(void * thiz)
        MP_CHECK(mp_playlist_data);
 
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK(ad);
        ad->del_cb_invoked = 0;
        // TODO: release resource..
        IF_FREE(mp_playlist_data->adding_media_id);
@@ -571,6 +572,7 @@ mp_edit_playlist_rename_done_cb(void *data, Evas_Object * obj, void *event_info)
        MP_CHECK(playlist);
 
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK(ad);
        text = mp_util_isf_get_edited_str(editfiled_entry, TRUE);
 
        if (!mp_util_is_playlist_name_valid((char *)text)) {

diff --git a/src/widget/mp-folder-list.c b/src/widget/mp-folder-list.c
index af38fbf1393c039af55689d867f593efa3b83c9b..936a54634ee0707c3c3b13172fbe4563f797c8a5 100755 (executable)
--- a/src/widget/mp-folder-list.c
+++ b/src/widget/mp-folder-list.c
@@ -48,6 +48,7 @@ _mp_folder_list_playall_button_cb(void *data, Evas_Object * obj, void *event_inf
        eventfunc;
 
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK(ad);
 
        mp_media_info_h handle = data;
        MP_CHECK(handle);

diff --git a/src/widget/mp-genre-list.c b/src/widget/mp-genre-list.c
index f50c6710792db9c7f420cb77ef7ecbef6a5e34df..9cca20fdf046390a90c576e8bec50b5749c5f643 100755 (executable)
--- a/src/widget/mp-genre-list.c
+++ b/src/widget/mp-genre-list.c
@@ -356,6 +356,9 @@ _mp_genre_list_item_longpressed_cb(void *data, Evas_Object *obj, void *event_inf
                temp = elm_gengrid_first_item_get(list->genlist);
                while (temp) {
                        item_data = elm_object_item_data_get(temp);
+                       if (!item_data) {
+                               continue;
+                       }
                        item_data->checked = false;
                        temp = elm_gengrid_item_next_get(temp);
                }
@@ -363,6 +366,9 @@ _mp_genre_list_item_longpressed_cb(void *data, Evas_Object *obj, void *event_inf
                temp = elm_genlist_first_item_get(list->genlist);
                while (temp) {
                        item_data = elm_object_item_data_get(temp);
+                       if (!item_data) {
+                               continue;
+                       }
                        item_data->checked = false;
                        temp = elm_genlist_item_next_get(temp);
                }

diff --git a/src/widget/mp-lyric.c b/src/widget/mp-lyric.c
index a1791928f9afdbf6afb0e3f9a4c931a954709f79..8874b61d9fac0bfd10d3106aeae5984bdc974a07 100644 (file)
--- a/src/widget/mp-lyric.c
+++ b/src/widget/mp-lyric.c
@@ -335,7 +335,7 @@ Evas_Object *mp_lyric_create(Evas_Object *parent, const char *path)
 
        wd = calloc(1, sizeof(MpLyricData_t));
        if (!wd) {
-               goto ERROR;
+               return NULL;
        }
 
        lyric_layout = _create_lyric(parent, wd);

diff --git a/src/widget/mp-minicontroller.c b/src/widget/mp-minicontroller.c
index 99b096b5d2f274f5a8c9210f40290f16e31aaf17..3d4ded70b8ac0194475af29891506e65ea451b88 100755 (executable)
--- a/src/widget/mp-minicontroller.c
+++ b/src/widget/mp-minicontroller.c
@@ -363,6 +363,7 @@ static void _quick_panel_cb(minicontrol_viewer_event_e event_type, bundle *event
 {
        startfunc;
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK(ad);
        minicontrol_viewer_event_e event_hide = (minicontrol_viewer_event_e)MINICONTROL_EVENT_REQUEST_HIDE;
        if (event_type == event_hide) {
                DEBUG_TRACE("CLOSE");

diff --git a/src/widget/mp-now-playing-list.c b/src/widget/mp-now-playing-list.c
index 0ad3afaa0143a3ab27461136e83950215ab9ddf0..a64a8fc70a3ade9c2d4d22f271439012caa5dd4b 100755 (executable)
--- a/src/widget/mp-now-playing-list.c
+++ b/src/widget/mp-now-playing-list.c
@@ -41,6 +41,7 @@ _mp_now_playing_list_label_get(void *data, Evas_Object * obj, const char *part)
        mp_retvm_if(!track, NULL, "data is null");
 
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK_NULL(ad);
        mp_plst_item * current = mp_playlist_mgr_get_current(ad->playlist_mgr);
 
        if (!strcmp(part, "elm.text") || !strcmp(part, "elm.text.sub")) {

diff --git a/src/widget/mp-now-playing.c b/src/widget/mp-now-playing.c
index 3c656b8c0db211acfb9adadd38338653475d2a41..99c51930bf5d1950b935c4a792acb37badd96e1a 100755 (executable)
--- a/src/widget/mp-now-playing.c
+++ b/src/widget/mp-now-playing.c
@@ -522,6 +522,7 @@ static void _set_layout(Evas_Object *obj)
 {
        int w, h;
        struct appdata *ad = mp_util_get_appdata();
+       MP_CHECK(ad);
        evas_object_geometry_get(ad->win_main, NULL, NULL, &w, &h);
        DEBUG_TRACE("Nowplaying bar w: %d", w);
        evas_object_size_hint_min_set(obj, w, 0);

diff --git a/src/widget/mp-popup.c b/src/widget/mp-popup.c
index 4b3491cbfd28ba78cffb03573fe7f300f838cf75..19afa89d92348ba596de33f946cdc878c912b83e 100755 (executable)
--- a/src/widget/mp-popup.c
+++ b/src/widget/mp-popup.c
@@ -591,6 +591,7 @@ mp_genlist_popup_create(Evas_Object * parent, mp_popup_t type, void *user_data,
 {
        mp_retvm_if(parent == NULL, NULL, "parent is NULL");
        ad = mp_util_get_appdata();
+       MP_CHECK_NULL(ad);
 
        if (_mp_popup_popup_exist(ad, MP_POPUP_GENLIST)) {
                DEBUG_TRACE("popup already exist...");

diff --git a/src/widget/mp-track-list.c b/src/widget/mp-track-list.c
index bc4bbd6dc5e2d6ad2ab44fe72500115601cfeb31..3bccb0b9121aaa4018cddef7ce2614392a0cf1a9 100644 (file)
--- a/src/widget/mp-track-list.c
+++ b/src/widget/mp-track-list.c
@@ -54,6 +54,7 @@ _mp_track_list_label_get(void *data, Evas_Object * obj, const char *part)
                MP_CHECK_NULL(list);
 
                struct appdata *ad = mp_util_get_appdata();
+               MP_CHECK_NULL(ad);
                mp_track_info_t* current = ad->current_track_info;