fixed svace issue

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

diff --git a/server/src/dbus/dbus-auth-adaptor.c b/server/src/dbus/dbus-auth-adaptor.c
index f68c6d0bbc7f09baca2bb70287ec0fbab4897f1e..4bf8156ae776b9ea4886c082a59ff7119de2f391 100644 (file)
--- a/server/src/dbus/dbus-auth-adaptor.c
+++ b/server/src/dbus/dbus-auth-adaptor.c
@@ -373,6 +373,7 @@ FUNC_STEP();
                        g_dbus_method_invocation_return_value(invocation, response);
 
                        g_variant_builder_unref(builder);
+                       g_hash_table_destroy(plugin_list);
                        return;
                }
 

diff --git a/server/src/dbus/dbus-util.c b/server/src/dbus/dbus-util.c
index f8c95e1eb814498682b492fbc34efac8a9b7cd24..a5f8fdd706ca961b016a5c59423f98612be1198a 100644 (file)
--- a/server/src/dbus/dbus-util.c
+++ b/server/src/dbus/dbus-util.c
@@ -76,26 +76,29 @@ char *ipc_g_variant_dup_string(GVariant *string)
 int sa_cynara_init()
 {
        int ret;
-       cynara_configuration *p_conf;
+       cynara_configuration *p_conf = NULL;
        size_t cache_size = 100;
 
        if (CYNARA_API_SUCCESS != cynara_configuration_create(&p_conf)) {
                service_adaptor_error("cynara_configuration_create() failed"); //LCOV_EXCL_LINE
                return SERVICE_ADAPTOR_INTERNAL_ERROR_ADAPTOR_INTERNAL; //LCOV_EXCL_LINE
+       } else {
+               if (CYNARA_API_SUCCESS != cynara_configuration_set_cache_size(p_conf, cache_size)) {
+                       service_adaptor_error("cynara_configuration_set_cache_size() failed"); //LCOV_EXCL_LINE
+                       cynara_configuration_destroy(p_conf); //LCOV_EXCL_LINE
+                       return SERVICE_ADAPTOR_INTERNAL_ERROR_ADAPTOR_INTERNAL; //LCOV_EXCL_LINE
+               }
+
+               ret = cynara_initialize(&_cynara, NULL);
+
+               if (CYNARA_API_SUCCESS != ret) {
+                       service_adaptor_error("cynara_initialize() Fail(%d)", ret); //LCOV_EXCL_LINE
+                       cynara_configuration_destroy(p_conf); //LCOV_EXCL_LINE
+                       return SERVICE_ADAPTOR_INTERNAL_ERROR_ADAPTOR_INTERNAL; //LCOV_EXCL_LINE
+               }
        }
-       if (CYNARA_API_SUCCESS != cynara_configuration_set_cache_size(p_conf, cache_size)) {
-               service_adaptor_error("cynara_configuration_set_cache_size() failed"); //LCOV_EXCL_LINE
-               cynara_configuration_destroy(p_conf); //LCOV_EXCL_LINE
-               return SERVICE_ADAPTOR_INTERNAL_ERROR_ADAPTOR_INTERNAL; //LCOV_EXCL_LINE
-       }
-
-       ret = cynara_initialize(&_cynara, NULL);
+       cynara_configuration_destroy(p_conf);
 
-       if (CYNARA_API_SUCCESS != ret) {
-               service_adaptor_error("cynara_initialize() Fail(%d)", ret); //LCOV_EXCL_LINE
-               cynara_configuration_destroy(p_conf); //LCOV_EXCL_LINE
-               return SERVICE_ADAPTOR_INTERNAL_ERROR_ADAPTOR_INTERNAL; //LCOV_EXCL_LINE
-       }
        return SERVICE_ADAPTOR_INTERNAL_ERROR_NONE;
 }