Fixed svace issue

Change-Id: Icad8423b454b21ec11970cfb2fe4da4f7019e3cd
Signed-off-by: Younho Park <younho.park@samsung.com>

diff --git a/adaptor/storage-adaptor/storage-adaptor.c b/adaptor/storage-adaptor/storage-adaptor.c
index 546fa83239a0db64481e1fd0fbad43d4d9f78359..07b24e0d1847eb3a6926d6a155eb7430875742cf 100644 (file)
--- a/adaptor/storage-adaptor/storage-adaptor.c
+++ b/adaptor/storage-adaptor/storage-adaptor.c
@@ -1341,18 +1341,21 @@ storage_adaptor_file_info_h storage_adaptor_create_file_info(void)
 {
        storage_adaptor_file_info_h _file_info = NULL;
        _file_info = (storage_adaptor_file_info_h) calloc(1, sizeof(storage_adaptor_file_info_t));
+       if (NULL == _file_info)
+               return NULL;
 
        storage_adaptor_media_meta_s *_media_meta = NULL;
        _media_meta = (storage_adaptor_media_meta_s *) calloc(1, sizeof(storage_adaptor_media_meta_s));
+       if (NULL == _media_meta) {
+               free(_file_info);
+               return NULL;
+       }
 
        storage_adaptor_cloud_meta_s *_cloud_meta = NULL;
        _cloud_meta = (storage_adaptor_cloud_meta_s *) calloc(1, sizeof(storage_adaptor_cloud_meta_s));
-
-       if ((NULL == _file_info) || (NULL == _media_meta) || (NULL == _cloud_meta)) {
+       if (NULL == _cloud_meta) {
                free(_file_info);
                free(_media_meta);
-               free(_cloud_meta);
-
                return NULL;
        }
 

diff --git a/packaging/service-adaptor.spec b/packaging/service-adaptor.spec
index ed8944dfa1f4585a2e0010e00dd241a0022bbe4e..5eaec134f12c3f426c8a0acbd03816cf4110fb02 100644 (file)
--- a/packaging/service-adaptor.spec
+++ b/packaging/service-adaptor.spec
@@ -1,6 +1,6 @@
 Name:       service-adaptor
 Summary:    Service Adaptor Framework for Convergence
-Version:    1.2.2
+Version:    1.2.3
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/server/src/dbus/dbus-storage-adaptor.c b/server/src/dbus/dbus-storage-adaptor.c
index da1fa2938073c27a52ffd45fceee4bdb8b3ff9c8..4d7ccff4d64963457aca7db4fb3d20b7c4e52bef 100644 (file)
--- a/server/src/dbus/dbus-storage-adaptor.c
+++ b/server/src/dbus/dbus-storage-adaptor.c
@@ -807,65 +807,67 @@ GVariant *__create_get_file_list_res_type(storage_adaptor_file_info_h *file_info
        storage_adaptor_file_info_h _file_info = NULL;
        storage_adaptor_file_info_h dummy_file_info = storage_adaptor_create_file_info();
 
-       for (gsize i = 0; i < file_info_len; i++) {
-               _file_info = file_info_list[i];
-               if (NULL == _file_info) {
-                       _file_info = dummy_file_info;
-               }
-
-               if (NULL == _file_info->media_meta) {
-                       _file_info->media_meta = dummy_file_info->media_meta;
-               }
-
-               if (NULL == _file_info->cloud_meta) {
-                       _file_info->cloud_meta = dummy_file_info->cloud_meta;
-               }
-
-               g_variant_builder_open(builder_file_info, G_VARIANT_TYPE(service_adaptor_file_info_s_type));
-
-               /* file_info default */
-               g_variant_builder_add(builder_file_info, "s", __safe_add_string(_file_info->plugin_uri));
-               g_variant_builder_add(builder_file_info, "s", __safe_add_string(_file_info->object_id));
-               g_variant_builder_add(builder_file_info, "s", __safe_add_string(_file_info->storage_path));
-               g_variant_builder_add(builder_file_info, "t", (uint64_t) _file_info->file_size);
-               g_variant_builder_add(builder_file_info, "t", (uint64_t) _file_info->created_time);
-               g_variant_builder_add(builder_file_info, "t", (uint64_t) _file_info->modified_time);
-               g_variant_builder_add(builder_file_info, "i", (int32_t) _file_info->file_info_index);
-               g_variant_builder_add(builder_file_info, "i", (int32_t) _file_info->content_type);
-
-               /* media_meta */
-
-               g_variant_builder_add_value(builder_file_info, g_variant_new(service_adaptor_content_meta_s_type,
-                               __safe_add_string(_file_info->media_meta->mime_type),
-                               __safe_add_string(_file_info->media_meta->title),
-                               __safe_add_string(_file_info->media_meta->album),
-                               __safe_add_string(_file_info->media_meta->artist),
-                               __safe_add_string(_file_info->media_meta->genere),
-                               __safe_add_string(_file_info->media_meta->recorded_date),
-                               (int32_t) _file_info->media_meta->width,
-                               (int32_t) _file_info->media_meta->height,
-                               (int32_t) _file_info->media_meta->duration,
-                               __safe_add_string(_file_info->media_meta->copyright),
-                               __safe_add_string(_file_info->media_meta->track_num),
-                               __safe_add_string(_file_info->media_meta->description),
-                               __safe_add_string(_file_info->media_meta->composer),
-                               __safe_add_string(_file_info->media_meta->year),
-                               (int32_t) _file_info->media_meta->bitrate,
-                               (int32_t) _file_info->media_meta->samplerate,
-                               (int32_t) _file_info->media_meta->channel,
-                               __safe_add_string(_file_info->media_meta->extra_media_meta)));
-
-               /* cloud_meta */
-               g_variant_builder_add_value(builder_file_info, g_variant_new(service_adaptor_cloud_meta_s_type,
-                               __safe_add_string(_file_info->cloud_meta->service_name),
-                               (uint64_t) _file_info->cloud_meta->usage_byte,
-                               (uint64_t) _file_info->cloud_meta->quota_byte));
-
-               g_variant_builder_add(builder_file_info, "s", __safe_add_string(_file_info->extra_file_info));
-
-               g_variant_builder_close(builder_file_info);
+       if (NULL != dummy_file_info) {
+               for (gsize i = 0; i < file_info_len; i++) {
+                       _file_info = file_info_list[i];
+                       if (NULL == _file_info) {
+                               _file_info = dummy_file_info;
+                       }
+
+                       if (NULL == _file_info->media_meta) {
+                               _file_info->media_meta = dummy_file_info->media_meta;
+                       }
+
+                       if (NULL == _file_info->cloud_meta) {
+                               _file_info->cloud_meta = dummy_file_info->cloud_meta;
+                       }
+
+                       g_variant_builder_open(builder_file_info, G_VARIANT_TYPE(service_adaptor_file_info_s_type));
+
+                       /* file_info default */
+                       g_variant_builder_add(builder_file_info, "s", __safe_add_string(_file_info->plugin_uri));
+                       g_variant_builder_add(builder_file_info, "s", __safe_add_string(_file_info->object_id));
+                       g_variant_builder_add(builder_file_info, "s", __safe_add_string(_file_info->storage_path));
+                       g_variant_builder_add(builder_file_info, "t", (uint64_t) _file_info->file_size);
+                       g_variant_builder_add(builder_file_info, "t", (uint64_t) _file_info->created_time);
+                       g_variant_builder_add(builder_file_info, "t", (uint64_t) _file_info->modified_time);
+                       g_variant_builder_add(builder_file_info, "i", (int32_t) _file_info->file_info_index);
+                       g_variant_builder_add(builder_file_info, "i", (int32_t) _file_info->content_type);
+
+                       /* media_meta */
+
+                       g_variant_builder_add_value(builder_file_info, g_variant_new(service_adaptor_content_meta_s_type,
+                                       __safe_add_string(_file_info->media_meta->mime_type),
+                                       __safe_add_string(_file_info->media_meta->title),
+                                       __safe_add_string(_file_info->media_meta->album),
+                                       __safe_add_string(_file_info->media_meta->artist),
+                                       __safe_add_string(_file_info->media_meta->genere),
+                                       __safe_add_string(_file_info->media_meta->recorded_date),
+                                       (int32_t) _file_info->media_meta->width,
+                                       (int32_t) _file_info->media_meta->height,
+                                       (int32_t) _file_info->media_meta->duration,
+                                       __safe_add_string(_file_info->media_meta->copyright),
+                                       __safe_add_string(_file_info->media_meta->track_num),
+                                       __safe_add_string(_file_info->media_meta->description),
+                                       __safe_add_string(_file_info->media_meta->composer),
+                                       __safe_add_string(_file_info->media_meta->year),
+                                       (int32_t) _file_info->media_meta->bitrate,
+                                       (int32_t) _file_info->media_meta->samplerate,
+                                       (int32_t) _file_info->media_meta->channel,
+                                       __safe_add_string(_file_info->media_meta->extra_media_meta)));
+
+                       /* cloud_meta */
+                       g_variant_builder_add_value(builder_file_info, g_variant_new(service_adaptor_cloud_meta_s_type,
+                                       __safe_add_string(_file_info->cloud_meta->service_name),
+                                       (uint64_t) _file_info->cloud_meta->usage_byte,
+                                       (uint64_t) _file_info->cloud_meta->quota_byte));
+
+                       g_variant_builder_add(builder_file_info, "s", __safe_add_string(_file_info->extra_file_info));
+
+                       g_variant_builder_close(builder_file_info);
+               }
+               storage_adaptor_destroy_file_info(&dummy_file_info);
        }
-       storage_adaptor_destroy_file_info(&dummy_file_info);
 
        GVariant *response = g_variant_new(MAKE_RETURN_TYPE(service_adaptor_get_file_list_res_s_type),
                        builder_file_info, (uint32_t)file_info_len,