Fix double unref issue

Change-Id: I4c4ff796133bce1cd9666b2b1617bd68cee19ef2
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>

diff --git a/packaging/libnet-client.spec b/packaging/libnet-client.spec
index 7c2785c..09f0853 100644 (file)
--- a/packaging/libnet-client.spec
+++ b/packaging/libnet-client.spec
@@ -1,6 +1,6 @@
 Name:       libnet-client
 Summary:    Network Client library (Shared library)
-Version:    0.1.77_48
+Version:    0.1.77_49
 Release:    1
 Group:      System/Network
 License:    Flora License

diff --git a/src/network-cm-intf.c b/src/network-cm-intf.c
index 7b9f4e4..ffe119c 100644 (file)
--- a/src/network-cm-intf.c
+++ b/src/network-cm-intf.c
@@ -106,9 +106,6 @@ static int __net_add_route(const char *ip_addr, const char *interface)
        g_variant_unref(message);
 
 done:
-       if (params)
-               g_variant_unref(params);
-
        __NETWORK_FUNC_EXIT__;
        return Error;
 }
@@ -155,8 +152,6 @@ static int __net_remove_route(const char *ip_addr, const char *interface)
        g_variant_unref(message);
 
 done:
-       if (params)
-               g_variant_unref(params);
        __NETWORK_FUNC_EXIT__;
        return Error;
 }

diff --git a/src/network-dbus-request.c b/src/network-dbus-request.c
index 7dcef17..7dc351a 100644 (file)
--- a/src/network-dbus-request.c
+++ b/src/network-dbus-request.c
@@ -539,18 +539,12 @@ static int __net_dbus_set_agent_field(const char *key, const char *value)
                                        "g_dbus_connection_call_sync() failed.\n");
                }
 
-               if (params)
-                       g_variant_unref(params);
-
                __NETWORK_FUNC_EXIT__;
                return NET_ERR_UNKNOWN;
        }
 
        g_variant_unref(reply);
 
-       if (params)
-               g_variant_unref(params);
-
        __NETWORK_FUNC_EXIT__;
        return NET_ERR_NONE;
 }
@@ -725,9 +719,6 @@ int _net_dbus_set_bgscan_mode(net_wifi_background_scan_mode_t mode)
        if (message != NULL)
                g_variant_unref(message);
 
-       if (params)
-               g_variant_unref(params);
-
        __NETWORK_FUNC_EXIT__;
        return Error;
 }
@@ -1103,9 +1094,6 @@ int _net_dbus_set_eap_config_fields(
 
        NETWORK_LOG(NETWORK_HIGH, "Successfully sent eap config fields\n");
 
-       if (params)
-               g_variant_unref(params);
-
        _net_dbus_pending_call_ref();
 
        __NETWORK_FUNC_EXIT__;
@@ -1380,9 +1368,6 @@ int _net_dbus_set_profile_ipv4(net_profile_info_t* prof_info, char* profile_name
                                "g_dbus_connection_call_sync() failed.\n");
                }
 
-               if (params)
-                       g_variant_unref(params);
-
                __NETWORK_FUNC_EXIT__;
                return NET_ERR_UNKNOWN;
        }
@@ -1390,9 +1375,6 @@ int _net_dbus_set_profile_ipv4(net_profile_info_t* prof_info, char* profile_name
        NETWORK_LOG(NETWORK_HIGH, "Successfully configured IPv4.Configuration\n");
        g_variant_unref(reply);
 
-       if (params)
-               g_variant_unref(params);
-
        __NETWORK_FUNC_EXIT__;
        return NET_ERR_NONE;
 }
@@ -1468,9 +1450,6 @@ int _net_dbus_set_profile_dns(net_profile_info_t* prof_info, char* profile_name)
                                        "g_dbus_connection_call_sync() failed.\n");
                        }
 
-                       if (params)
-                               g_variant_unref(params);
-
                        __NETWORK_FUNC_EXIT__;
                        return NET_ERR_UNKNOWN;
                }
@@ -1479,9 +1458,6 @@ int _net_dbus_set_profile_dns(net_profile_info_t* prof_info, char* profile_name)
                g_variant_unref(reply);
        }
 
-       if (params)
-               g_variant_unref(params);
-
        __NETWORK_FUNC_EXIT__;
        return NET_ERR_NONE;
 }
@@ -1577,9 +1553,6 @@ int _net_dbus_set_proxy(net_profile_info_t* prof_info, char* profile_name)
                                "g_dbus_connection_call_sync() failed.\n");
                }
 
-               if (params)
-                       g_variant_unref(params);
-
                __NETWORK_FUNC_EXIT__;
                return NET_ERR_UNKNOWN;
        }
@@ -1587,9 +1560,6 @@ int _net_dbus_set_proxy(net_profile_info_t* prof_info, char* profile_name)
        NETWORK_LOG(NETWORK_HIGH, "Successfully configured Proxy.Configuration\n");
        g_variant_unref(reply);
 
-       if (params)
-               g_variant_unref(params);
-
        __NETWORK_FUNC_EXIT__;
        return NET_ERR_NONE;
 }
@@ -1720,9 +1690,6 @@ int _net_dbus_add_pdp_profile(net_profile_info_t *prof_info)
                                "g_dbus_connection_call_sync() failed.\n");
                }
 
-               if (params)
-                       g_variant_unref(params);
-
                __NETWORK_FUNC_EXIT__;
                return NET_ERR_UNKNOWN;
        }
@@ -1742,9 +1709,6 @@ int _net_dbus_add_pdp_profile(net_profile_info_t *prof_info)
 
        g_variant_unref(reply);
 
-       if (params)
-               g_variant_unref(params);
-
        __NETWORK_FUNC_EXIT__;
        return Error;
 }
@@ -1903,9 +1867,6 @@ int _net_dbus_modify_pdp_profile(net_profile_info_t *prof_info, const char *prof
                                        "g_dbus_connection_call_sync() failed.\n");
                }
 
-               if (params)
-                       g_variant_unref(params);
-
                __NETWORK_FUNC_EXIT__;
                return NET_ERR_UNKNOWN;
        }
@@ -1924,9 +1885,6 @@ int _net_dbus_modify_pdp_profile(net_profile_info_t *prof_info, const char *prof
 
        g_variant_unref(reply);
 
-       if (params)
-               g_variant_unref(params);
-
        __NETWORK_FUNC_EXIT__;
        return Error;
 }
@@ -2032,9 +1990,6 @@ int _net_dbus_specific_scan_request(const char *ssid)
 
        _net_dbus_pending_call_ref();
 
-       if (params)
-               g_variant_unref(params);
-
        __NETWORK_FUNC_EXIT__;
        return NET_ERR_NONE;
 }

diff --git a/src/network-profile-intf.c b/src/network-profile-intf.c
index c895180..a914d14 100644 (file)
--- a/src/network-profile-intf.c
+++ b/src/network-profile-intf.c
@@ -1654,9 +1654,6 @@ static int __net_wifi_delete_profile(net_profile_name_t* WifiProfName,
 
        g_variant_unref(message);
 done:
-       if (params)
-               g_variant_unref(params);
-
        __NETWORK_FUNC_EXIT__;
        return Error;
 }