Merge "Fix derefrencing of NULL pointer" into tizen

[platform/upstream/connman.git] / plugins / ethernet.c

diff --git a/plugins/ethernet.c b/plugins/ethernet.c
index 57d6542..b0031cb 100644 (file)
--- a/plugins/ethernet.c
+++ b/plugins/ethernet.c
@@ -221,7 +221,7 @@ static int eth_network_connect(struct connman_network *network)
                g_supplicant_register_eap_callback(handle_eap_signal);
                g_network = network;
 
-               if (asprintf(&config_file, "/opt/usr/data/network/%s-eapol.conf", ifname) < 0) {
+               if (asprintf(&config_file, "/var/lib/connman/%s-eapol.conf", ifname) < 0) {
                        g_free(ifname);
                        return -ENOMEM;
                }
@@ -437,7 +437,10 @@ static void eth_dev_remove(struct connman_device *device)
        connman_device_set_data(device, NULL);
 
 #if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
-       if (ethernet && ethernet->interface) {
+       if (!ethernet)
+              return;
+
+       if (ethernet->interface) {
                g_supplicant_interface_remove(ethernet->interface, NULL, NULL);
                ethernet->interface = NULL;
        }