diff options
| author | Minje Ahn <minje.ahn@samsung.com> | 2024-07-15 14:31:51 +0900 |
|---|---|---|
| committer | Minje Ahn <minje.ahn@samsung.com> | 2024-07-15 15:03:43 +0900 |
| commit | 3b63c393413bc193d8853029ffe892f4efa87754 (patch) | |
| tree | 0a14925c1f6d0adfc5a04e6c021f6a097cc355e2 | |
| parent | df0ab168bc5aa8c585f6d89a658e431488825025 (diff) | |
| download | libmedia-service-accepted/tizen_unified.tar.gz libmedia-service-accepted/tizen_unified.tar.bz2 libmedia-service-accepted/tizen_unified.zip | |
Set NULL after freeHEADaccepted/tizen/unified/x/asan/20240813.231356accepted/tizen/unified/x/20240718.022859accepted/tizen/unified/toolchain/20240812.133113accepted/tizen/unified/dev/20240718.035906accepted/tizen/unified/20240717.060536tizenaccepted/tizen_unified_x_asanaccepted/tizen_unified_xaccepted/tizen_unified_toolchainaccepted/tizen_unified_devaccepted/tizen_unified
Change-Id: Ie97d67a234ed5b216e1afa3cc212321b8740b246
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
| -rw-r--r-- | src/media-svc-util.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/media-svc-util.c b/src/media-svc-util.c index 6d97ba8..d2faaa4 100644 --- a/src/media-svc-util.c +++ b/src/media-svc-util.c @@ -361,11 +361,9 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char } if (!refresh) { + media_svc_retv_del_if(!storage_id, MS_MEDIA_ERR_INTERNAL, content_info); content_info->storage_uuid = g_strdup(storage_id); - media_svc_retv_del_if(content_info->storage_uuid == NULL, MS_MEDIA_ERR_INTERNAL, content_info); - content_info->media_uuid = __media_info_generate_uuid(); - media_svc_retv_del_if(content_info->media_uuid == NULL, MS_MEDIA_ERR_INTERNAL, content_info); } ret = __media_svc_get_mime_type(path, mime_type); @@ -953,23 +951,23 @@ void _media_svc_destroy_content_info(media_svc_content_info_s *content_info) media_svc_retm_if(!content_info, "content info is NULL"); /* Delete media_svc_content_info_s */ - g_free(content_info->media_uuid); - g_free(content_info->path); - g_free(content_info->file_name); - g_free(content_info->mime_type); - g_free(content_info->thumbnail_path); - g_free(content_info->storage_uuid); + g_clear_pointer(&content_info->media_uuid, g_free); + g_clear_pointer(&content_info->path, g_free); + g_clear_pointer(&content_info->file_name, g_free); + g_clear_pointer(&content_info->mime_type, g_free); + g_clear_pointer(&content_info->thumbnail_path, g_free); + g_clear_pointer(&content_info->storage_uuid, g_free); /* Delete media_svc_content_meta_s */ - g_free(content_info->media_meta.title); - g_free(content_info->media_meta.album); - g_free(content_info->media_meta.artist); - g_free(content_info->media_meta.album_artist); - g_free(content_info->media_meta.genre); - g_free(content_info->media_meta.year); - g_free(content_info->media_meta.recorded_date); - g_free(content_info->media_meta.track_num); - g_free(content_info->media_meta.datetaken); + g_clear_pointer(&content_info->media_meta.title, g_free); + g_clear_pointer(&content_info->media_meta.album, g_free); + g_clear_pointer(&content_info->media_meta.artist, g_free); + g_clear_pointer(&content_info->media_meta.album_artist, g_free); + g_clear_pointer(&content_info->media_meta.genre, g_free); + g_clear_pointer(&content_info->media_meta.year, g_free); + g_clear_pointer(&content_info->media_meta.recorded_date, g_free); + g_clear_pointer(&content_info->media_meta.track_num, g_free); + g_clear_pointer(&content_info->media_meta.datetaken, g_free); } int _media_svc_create_thumbnail(const char *path, char *thumb_path, media_svc_media_type_e media_type, uid_t uid) |