Coverity Fix

Change-Id: I98f936ca8a91d3465ec24064053030b97f535e56
Signed-off-by: sanghyeok.oh <sanghyeok.oh@samsung.com>

diff --git a/src/daemon/core/gumd-daemon-user.c b/src/daemon/core/gumd-daemon-user.c
index f4c602e..39d6085 100755 (executable)
--- a/src/daemon/core/gumd-daemon-user.c
+++ b/src/daemon/core/gumd-daemon-user.c
@@ -1341,9 +1341,10 @@ _add_userinfo(GumdDaemonUser *self)
     if (self->priv->info->icon)
         g_key_file_set_string(key, "User", "Icon", self->priv->info->icon);
 
-    if (!_get_userinfo_path(self, path, sizeof(path)))
+    if (!_get_userinfo_path(self, path, sizeof(path))) {
+        g_key_file_free(key);
         return FALSE;
-
+    }
     if (!g_key_file_save_to_file(key, path, &error)) {
         WARN("Key file save failure error %d:%s", error ? error->code : 0,
                 error ? error->message : "");
@@ -1368,8 +1369,10 @@ _update_userinfo(GumdDaemonUser *self, struct _userinfo *info)
     if (!key)
         return FALSE;
 
-    if (!_get_userinfo_path(self, path, sizeof(path)))
+    if (!_get_userinfo_path(self, path, sizeof(path))) {
+        g_key_file_free(key);
         return FALSE;
+    }
 
     g_key_file_load_from_file(key, path, G_KEY_FILE_NONE, NULL);
 
@@ -1400,8 +1403,10 @@ _get_userinfo(GumdDaemonUser *self, struct _userinfo *info)
     if (!key)
         return FALSE;
 
-    if (!_get_userinfo_path(self, path, sizeof(path)))
+    if (!_get_userinfo_path(self, path, sizeof(path))) {
+        g_key_file_free(key);
         return FALSE;
+    }
 
     if (!g_key_file_load_from_file(key, path, G_KEY_FILE_NONE, &error)) {
         g_key_file_free(key);

diff --git a/src/lib/gum-group.c b/src/lib/gum-group.c
old mode 100644 (file)
new mode 100755 (executable)
index aac9a20..cb6d321
--- a/src/lib/gum-group.c
+++ b/src/lib/gum-group.c
@@ -711,7 +711,13 @@ gum_group_create (
         gpointer user_data)
 {
     GumGroup *group = GUM_GROUP (g_object_new (GUM_TYPE_GROUP, NULL));
-    g_return_val_if_fail (group->priv->dbus_service != NULL, NULL);
+
+    if (!group) return NULL;
+
+    if (!group->priv->dbus_service) {
+        g_object_unref(group);
+        return NULL;
+    }
 
     _create_op (group, callback, user_data);
     gum_dbus_group_service_call_create_new_group (group->priv->dbus_service,
@@ -746,7 +752,10 @@ gum_group_create_sync (
         return group;
     }
 
-    g_return_val_if_fail (group->priv->dbus_service != NULL, NULL);
+    if (!group->priv->dbus_service) {
+        g_object_unref(group);
+        return NULL;
+    }
 
     if (gum_dbus_group_service_call_create_new_group_sync (
             group->priv->dbus_service, &object_path, group->priv->cancellable,
@@ -786,7 +795,13 @@ gum_group_get (
         gpointer user_data)
 {
     GumGroup *group = GUM_GROUP (g_object_new (GUM_TYPE_GROUP, NULL));
-    g_return_val_if_fail (group->priv->dbus_service != NULL, NULL);
+
+    if (!group) return NULL;
+
+    if (!group->priv->dbus_service) {
+        g_object_unref(group);
+        return NULL;
+    }
 
     _create_op (group, callback, user_data);
     gum_dbus_group_service_call_get_group (group->priv->dbus_service, gid,
@@ -860,7 +875,13 @@ gum_group_get_by_name (
         gpointer user_data)
 {
     GumGroup *group = GUM_GROUP (g_object_new (GUM_TYPE_GROUP, NULL));
-    g_return_val_if_fail (group->priv->dbus_service != NULL, NULL);
+
+    if (!group) return NULL;
+
+    if (!group->priv->dbus_service) {
+        g_object_unref(group);
+        return NULL;
+    }
 
     if (!groupname) {
         WARN ("groupname not specified");

diff --git a/src/lib/gum-user.c b/src/lib/gum-user.c
old mode 100644 (file)
new mode 100755 (executable)
index 9313479..fa98441
--- a/src/lib/gum-user.c
+++ b/src/lib/gum-user.c
@@ -797,7 +797,12 @@ gum_user_create (
     GumUser *user = GUM_USER (g_object_new (GUM_TYPE_USER, "offline", FALSE,
             NULL));
 
-    g_return_val_if_fail (user && user->priv->dbus_service != NULL, NULL);
+    if (!user) return NULL;
+
+    if (!user->priv->dbus_service) {
+        g_object_unref(user);
+        return NULL;
+    }
     _create_op (user, callback, user_data);
     gum_dbus_user_service_call_create_new_user (
             (GumDbusUserService*) gum_user_service_get_dbus_proxy (
@@ -834,7 +839,10 @@ gum_user_create_sync (
         return user;
     }
 
-    g_return_val_if_fail (user->priv->dbus_service != NULL, NULL);
+    if (!user->priv->dbus_service) {
+        g_object_unref(user);
+        return NULL;
+    }
 
     if (gum_dbus_user_service_call_create_new_user_sync (
             (GumDbusUserService*) gum_user_service_get_dbus_proxy (
@@ -877,7 +885,12 @@ gum_user_get (
     GumUser *user = GUM_USER (g_object_new (GUM_TYPE_USER, "offline", FALSE,
             NULL));
 
-    g_return_val_if_fail (user && user->priv->dbus_service != NULL, NULL);
+    if (!user) return NULL;
+
+    if (!user->priv->dbus_service) {
+        g_object_unref(user);
+        return NULL;
+    }
 
     _create_op (user, callback, user_data);
      gum_dbus_user_service_call_get_user (
@@ -964,7 +977,12 @@ gum_user_get_by_name (
 
     user = GUM_USER (g_object_new (GUM_TYPE_USER, "offline", FALSE, NULL));
 
-    g_return_val_if_fail (user && user->priv->dbus_service != NULL, NULL);
+    if (!user) return NULL;
+
+    if (!user->priv->dbus_service) {
+        g_object_unref(user);
+        return NULL;
+    }
 
     _create_op (user, callback, user_data);
     gum_dbus_user_service_call_get_user_by_name (