Removed [WGID-55466,55467,55468,55494 ]

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

diff --git a/playview/src/core/vp-media-contents.c b/playview/src/core/vp-media-contents.c
index 66bd027..e50b058 100644 (file)
--- a/playview/src/core/vp-media-contents.c
+++ b/playview/src/core/vp-media-contents.c
@@ -1362,7 +1362,7 @@ bool vp_media_contents_bookmark_list_get(const char *szMediaID,
        nRet = media_filter_destroy(pFilterHandle);
        if (nRet != MEDIA_CONTENT_ERROR_NONE) {
                VideoLogError("media_filter_destroy is fail : 0x%x", nRet);
-               goto Exception;
+               return FALSE;
        }
 
        return TRUE;
@@ -1876,7 +1876,9 @@ bool vp_media_contents_get_video_items(int nSortType, GList **pList)
        nRet = media_filter_destroy(pFilterHandle);
        if (nRet != MEDIA_CONTENT_ERROR_NONE) {
                VideoLogError("media_filter_destroy is fail : 0x%x", nRet);
-               goto Exception;
+               VP_FREE(szCondition);
+               VP_FREE(szOrder);
+               return FALSE;
        }
 
        VP_FREE(szCondition);
@@ -2629,7 +2631,8 @@ bool vp_media_contents_subtitle_list_get(GList **pList)
        nRet = media_filter_destroy(pFilterHandle);
        if (nRet != MEDIA_CONTENT_ERROR_NONE) {
                VideoLogError("media_filter_destroy is fail : 0x%x", nRet);
-               goto Exception;
+               VP_FREE(szCondition);
+               return FALSE;
        }
 
        VP_FREE(szCondition);

diff --git a/src/common/mp-util-media-service.c b/src/common/mp-util-media-service.c
index 00fe1d2..436a681 100644 (file)
--- a/src/common/mp-util-media-service.c
+++ b/src/common/mp-util-media-service.c
@@ -1114,6 +1114,7 @@ bool mp_util_svc_get_video_id_by_video_url(const char *szPath, char **szVideoID)
        filter_h m_FilterHandle = NULL;
        char szTmpStr[STR_LEN_MAX] = {0,};
        bool bRet = FALSE;
+       int ret = -1;
 
        if (media_filter_create(&m_FilterHandle) != MEDIA_CONTENT_ERROR_NONE) {
                VideoLogInfo("Fail to create media filter handle.");
@@ -1126,6 +1127,7 @@ bool mp_util_svc_get_video_id_by_video_url(const char *szPath, char **szVideoID)
                        MEDIA_CONTENT_ERROR_NONE) {
                VideoLogError("Fail to set filter condition.");
                media_filter_destroy(m_FilterHandle);
+               m_FilterHandle = NULL;
                bRet = FALSE;
        }
 
@@ -1133,12 +1135,19 @@ bool mp_util_svc_get_video_id_by_video_url(const char *szPath, char **szVideoID)
                mp_util_svc_iterate_for_get_video_item_cb, &pVideoItem) !=
                        MEDIA_CONTENT_ERROR_NONE) {
                VideoLogError("Fail to get video item list with filter condition.");
-               media_filter_destroy(m_FilterHandle);
+               if(m_FilterHandle) {
+                       media_filter_destroy(m_FilterHandle);
+                       m_FilterHandle = NULL;
+               }
                bRet = FALSE;
        }
 
-       if (media_filter_destroy(m_FilterHandle) != MEDIA_CONTENT_ERROR_NONE) {
-               VideoLogError("Fail to destroy media filter handle.");
+       if(m_FilterHandle) {
+               ret = media_filter_destroy(m_FilterHandle);
+               if (ret != MEDIA_CONTENT_ERROR_NONE) {
+                       VideoLogError("Fail to destroy media filter handle.");
+                       m_FilterHandle = NULL;
+               }
                bRet = FALSE;
        }