From 0c2f05d3befdc85d0252b4b7bb7b8d921c2263e2 Mon Sep 17 00:00:00 2001 From: "Haejeong, Kim" Date: Tue, 13 Oct 2015 10:38:48 +0900 Subject: [PATCH] Prevent issue fix Change-Id: I4d5146b06aa692f7c04b54cb24ec32de5ad9d58a --- src/media_content.c | 2 +- src/media_info.c | 7 +++---- src/media_util_private.c | 13 ++++--------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/media_content.c b/src/media_content.c index a980345..ea518af 100755 --- a/src/media_content.c +++ b/src/media_content.c @@ -603,11 +603,11 @@ int __media_content_cynara_check(const char *privilege) smack = fgets(buf, sizeof(buf), pFile); fclose(pFile); } else { + SAFE_FREE(session); media_content_error("current info read failed"); return MEDIA_CONTENT_ERROR_INVALID_OPERATION; } - G_LOCK(cynara_mutex); result = cynara_check(_cynara, smack, session, c_uid, privilege); G_UNLOCK(cynara_mutex); diff --git a/src/media_info.c b/src/media_info.c index ac38822..b57c48e 100755 --- a/src/media_info.c +++ b/src/media_info.c @@ -111,8 +111,7 @@ static bool __media_info_delete_batch_cb(media_info_h media, void *user_data) media_content_type_e media_type = 0; GArray *thumb_list = (GArray *)user_data; - if (media == NULL) - { + if (media == NULL) { media_content_debug("NO Item"); return true; } @@ -122,7 +121,7 @@ static bool __media_info_delete_batch_cb(media_info_h media, void *user_data) media_content_debug("media_type : [%d]", media_type); media_info_get_thumbnail_path(media, &thumb_path); - if (STRING_VALID(thumb_path)) { + if (STRING_VALID(thumb_path) && STRING_VALID(MEDIA_CONTENT_THUMB_DEFAULT_PATH)) { if (strncmp(MEDIA_CONTENT_THUMB_DEFAULT_PATH, thumb_path, strlen(MEDIA_CONTENT_THUMB_DEFAULT_PATH)) != 0) { g_array_append_val(thumb_list, thumb_path); } @@ -3365,7 +3364,7 @@ int media_info_create(const char *path, media_info_h *media) memset(storage_id, 0x00, sizeof(storage_id)); - if (strstr(MEDIA_ROOT_PATH_CLOUD, path) == NULL) { + if (STRING_VALID(MEDIA_ROOT_PATH_CLOUD) && (strstr(MEDIA_ROOT_PATH_CLOUD, path) == NULL)) { bool ignore_file = FALSE; bool ignore_dir = FALSE; char *folder_path = NULL; diff --git a/src/media_util_private.c b/src/media_util_private.c index 8587baa..4bd9d82 100755 --- a/src/media_util_private.c +++ b/src/media_util_private.c @@ -138,21 +138,16 @@ int _media_util_check_ignore_dir(const char *dir_path, bool *ignore) else { /*If root path, Stop Scanning*/ - if((storage_type == MEDIA_SVC_STORAGE_INTERNAL) && (strcmp(search_path, MEDIA_ROOT_PATH_INTERNAL) == 0)) - { + if((storage_type == MEDIA_SVC_STORAGE_INTERNAL) && (strcmp(search_path, MEDIA_ROOT_PATH_INTERNAL) == 0)) { break; - } - else if((storage_type == MEDIA_SVC_STORAGE_EXTERNAL) && (strcmp(search_path, MEDIA_ROOT_PATH_SDCARD) == 0)) - { + } else if((storage_type == MEDIA_SVC_STORAGE_EXTERNAL) && (STRING_VALID(MEDIA_ROOT_PATH_SDCARD)) && (strcmp(search_path, MEDIA_ROOT_PATH_SDCARD) == 0)) { break; - } - else if(storage_type == MEDIA_SVC_STORAGE_EXTERNAL_USB) - { + } else if(storage_type == MEDIA_SVC_STORAGE_EXTERNAL_USB) { char *parent_folder_path = NULL; bool is_root = FALSE; parent_folder_path = g_path_get_dirname(search_path); - if (strcmp(search_path, MEDIA_ROOT_PATH_USB) == 0) + if (STRING_VALID(MEDIA_ROOT_PATH_USB) && (strcmp(parent_folder_path, MEDIA_ROOT_PATH_USB) == 0)) is_root = TRUE; SAFE_FREE(parent_folder_path); -- 2.7.4