Merge "[net-config] Pointer is passed to g_free() after the memory was deallocated...

diff --combined src/wifi-agent.c
index 57f8bf0,b8b02a6..bb6facc
--- 1/src/wifi-agent.c
--- 2/src/wifi-agent.c
+++ b/src/wifi-agent.c
@@@ -203,17 -203,13 +203,13 @@@ gboolean handle_set_field(NetConnmanAge
        g_variant_get(fields, "a{sv}", &iter);
        while (g_variant_iter_loop(iter, "{sv}", &field, &value)) {
                if (g_strcmp0(field, NETCONFIG_AGENT_FIELD_PASSPHRASE) == 0) {
-                       g_free(agent.passphrase);
                        if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
                                agent.passphrase = g_strdup(g_variant_get_string(value, NULL));
                                updated = TRUE;
  
                                DBG("Field [%s] - []", field);
-                       } else {
-                               agent.passphrase = NULL;
                        }
                } else if (g_strcmp0(field, NETCONFIG_AGENT_FIELD_WPS_PBC) == 0) {
-                       agent.wps_pbc = FALSE;
                        if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING) &&
                                        g_strcmp0(g_variant_get_string(value, NULL), "enable") == 0) {
                                agent.wps_pbc = TRUE;
@@@ -222,25 -218,18 +218,18 @@@
                                DBG("Field [%s] - [%d]", field, agent.wps_pbc);
                        }
                } else if (g_strcmp0(field, NETCONFIG_AGENT_FIELD_WPS_PIN) == 0) {
-                       g_free(agent.wps_pin);
-                       agent.wps_pbc = FALSE;
                        if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
                                agent.wps_pin = g_strdup(g_variant_get_string(value, NULL));
                                updated = TRUE;
  
                                DBG("Field [%s] - []", field);
-                       } else {
-                               agent.wps_pin = NULL;
                        }
                } else if (g_strcmp0(field, NETCONFIG_AGENT_FIELD_NAME) == 0) {
-                       g_free(agent.name);
                        if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
                                agent.name = g_strdup(g_variant_get_string(value, NULL));
                                updated = TRUE;
  
                                DBG("Field [%s] - []", field);
-                       } else {
-                               agent.name = NULL;
                        }
                } else if (g_strcmp0(field, NETCONFIG_AGENT_FIELD_SSID) == 0) {
                        if (agent.ssid != NULL) {
@@@ -268,22 -257,18 +257,19 @@@
                                }
                        }
                } else if (g_strcmp0(field, NETCONFIG_AGENT_FIELD_IDENTITY) == 0) {
-                       g_free(agent.identity);
                        if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
                                agent.identity = g_strdup(g_variant_get_string(value, NULL));
                                updated = TRUE;
  
                                DBG("Field [%s] - []", field);
-                       } else {
-                               agent.identity = NULL;
                        }
                }
        }
  
        if (updated == TRUE) {
                reply = netconfig_invoke_dbus_method_nonblock(CONNMAN_SERVICE,
 -                              service, CONNMAN_SERVICE_INTERFACE, "Connect", NULL, NULL);
 +                              service, CONNMAN_SERVICE_INTERFACE, "Connect",
 +                              NULL, __netconfig_wifi_connect_reply);
                if (reply == TRUE) {
                        g_dbus_method_invocation_return_value (context, NULL);
                } else {