Fix SVACE issues 72/151472/1
authorRavi Kiran K N <ravi.kiran@samsung.com>
Thu, 21 Sep 2017 04:17:40 +0000 (09:47 +0530)
committerRavi Kiran K N <ravi.kiran@samsung.com>
Thu, 21 Sep 2017 04:17:40 +0000 (09:47 +0530)
Change-Id: Ic25eac7e5b0838081c6bb7bfa8f25aad19a6c32f
Signed-off-by: Ravi Kiran K N <ravi.kiran@samsung.com>
playview/src/feature/vp-subtitle-bg-color.c
playview/src/feature/vp-subtitle-track.c
src/feature/mp-util-move.c
src/widget/mp-video-rename-ctrl.c
vp-main/src/vp-main.c

index 0b6b4ef..c910a0a 100644 (file)
@@ -420,7 +420,8 @@ subtitle_bg_color_handle vp_subtitle_bg_color_create(Evas_Object *
        if (!_vp_subtitle_bg_color_add_genlist_item
                (pSubtitleBGColor->pGenList, (void *) pSubtitleBGColor)) {
                VideoLogError("_vp_subtitle_bg_color_add_genlist_item fail");
-               return FALSE;
+               _vp_subtitle_bg_color_destroy_handle(pSubtitleBGColor);
+               return NULL;
        }
 
        pSubtitleBGColor->currentBgColor = nDefaultColor;
index 3b50c45..af50f3f 100644 (file)
@@ -757,9 +757,8 @@ bool vp_subtitle_track_add_Item(subtitle_track_handle
        if (pName) {
                pItem->szName = pName;
        } else {
-               char *pUnknown = NULL;
-               pUnknown = g_strdup_printf("%s", VP_PLAY_STRING_COM_UNKNOWN);
-               pItem->szName = pUnknown;
+               pName = g_strdup_printf("%s", VP_PLAY_STRING_COM_UNKNOWN);
+               pItem->szName = pName;
        }
 
        pSubtitleTrack->pItemList =
index a1417c2..3559245 100644 (file)
@@ -789,6 +789,10 @@ static bool __mp_util_check_if_in_same_folder(char *sourcePath,
 
        char *filePath_temp = strdup(filePath);
 
+       if (filePath_temp == NULL) {
+               return false;
+       }
+
        if (!strcmp(sourcePath, filePath_temp)) {
                free(filePath_temp);
                return true;
index 1b2f55d..1fa67c8 100644 (file)
@@ -202,6 +202,7 @@ static void __mp_rename_ctrl_ok_btn_cb(void *pUserData,
                MP_FREE_STRING(szFilePath);
                MP_FREE_STRING(szFileExt);
                MP_FREE_STRING(szLocation);
+               MP_FREE_STRING(szNewPath);
 
                if (g_pRenameHandle->RenameCtrlUserCbFunc) {
                        g_pRenameHandle->RenameCtrlUserCbFunc();
@@ -697,7 +698,7 @@ void mp_rename_ctrl_focus_out_cb(void)
                                                                           __mp_rename_ctrl_cancel_btn_cb);
        }
 
-       if (g_pRenameHandle->pPopUpHandle) {
+       if (g_pRenameHandle->pPopupCancelBtn) {
                evas_object_smart_callback_del(g_pRenameHandle->pPopupCancelBtn,
                                                                           "clicked",
                                                                           __mp_rename_ctrl_cancel_btn_cb);
@@ -720,7 +721,7 @@ void mp_rename_ctrl_delete_handle(void)
                                                                           __mp_rename_ctrl_cancel_btn_cb);
        }
 
-       if (g_pRenameHandle->pPopUpHandle) {
+       if (g_pRenameHandle->pPopupCancelBtn) {
                evas_object_smart_callback_del(g_pRenameHandle->pPopupCancelBtn,
                                                                           "clicked",
                                                                           __mp_rename_ctrl_cancel_btn_cb);
index 78c2941..a450cc2 100644 (file)
@@ -515,16 +515,9 @@ static void __appControl(app_control_h pAppSvcHandle, void *pUserData)
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 // for sidesync
 //////////////////////////////////////////////////////////////////////////////////////////////////////
-       if (pAppData->pServiceData->pMediaUri != NULL) {
-               bool is_pss = FALSE;
-
-               VideoSecureLogInfo("is_pss : [%d]", is_pss);
-
-               if (is_pss == TRUE) {
+       if (pAppData->pServiceData && pAppData->pServiceData->pMediaUri != NULL) {
                        VideoSecureLogInfo("ss-play: %s",
                                                           pAppData->pServiceData->pMediaUri);
-                       return;
-               }
        }
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////////////////////////