X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fwifi-config.c;h=efcfd22660d4d1c6b9a06419b6d5521563be7732;hb=fd923f0bf938ceefa8610485bd50e81fd62479a8;hp=34765768bfdd2bab308205eb5b3fbfe9bdfdf2ea;hpb=da26d5702240e11754e07bebcc2b1ebc9248aa80;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git

diff --git a/src/wifi-config.c b/src/wifi-config.c
index 3476576..efcfd22 100755
--- a/src/wifi-config.c
+++ b/src/wifi-config.c
@@ -103,41 +103,42 @@ static gboolean __get_mac_address(gchar **mac_address)
 	gchar *tmp = NULL;
 	gchar mac[13] = { 0, };
 	gint i = 0, j = 0;
-#if defined TIZEN_TV
-	FILE *fp = NULL;
-	char buf[WIFI_MAC_ADD_LENGTH + 1];
-	if (0 == access(WIFI_MAC_ADD_PATH, F_OK))
-		fp = fopen(WIFI_MAC_ADD_PATH, "r");
-
-	if (fp == NULL) {
-		ERR("Failed to open file %s\n", WIFI_MAC_ADD_PATH);
-		*mac_address = NULL;
-		return FALSE;
-	}
 
-	if (fgets(buf, sizeof(buf), fp) == NULL) {
-		ERR("Failed to get MAC info from %s\n", WIFI_MAC_ADD_PATH);
-		*mac_address = NULL;
-		fclose(fp);
-		return FALSE;
-	}
-	tmp_mac = (char *)g_try_malloc0(WIFI_MAC_ADD_LENGTH + 1);
-	if (tmp_mac == NULL) {
-		ERR("malloc() failed");
-		*mac_address = NULL;
+	if (TIZEN_TV) {
+		FILE *fp = NULL;
+		char buf[WIFI_MAC_ADD_LENGTH + 1];
+		if (0 == access(WIFI_MAC_ADD_PATH, F_OK))
+			fp = fopen(WIFI_MAC_ADD_PATH, "r");
+
+		if (fp == NULL) {
+			ERR("Failed to open file %s\n", WIFI_MAC_ADD_PATH);
+			*mac_address = NULL;
+			return FALSE;
+		}
+
+		if (fgets(buf, sizeof(buf), fp) == NULL) {
+			ERR("Failed to get MAC info from %s\n", WIFI_MAC_ADD_PATH);
+			*mac_address = NULL;
+			fclose(fp);
+			return FALSE;
+		}
+		tmp_mac = (char *)g_try_malloc0(WIFI_MAC_ADD_LENGTH + 1);
+		if (tmp_mac == NULL) {
+			ERR("malloc() failed");
+			*mac_address = NULL;
+			fclose(fp);
+			return FALSE;
+		}
+		g_strlcpy(tmp_mac, buf, WIFI_MAC_ADD_LENGTH + 1);
 		fclose(fp);
-		return FALSE;
-	}
-	g_strlcpy(tmp_mac, buf, WIFI_MAC_ADD_LENGTH + 1);
-	fclose(fp);
-#else
-	tmp_mac = vconf_get_str(VCONFKEY_WIFI_BSSID_ADDRESS);
-	if (tmp_mac == NULL) {
-		ERR("vconf_get_str(WIFI_BSSID_ADDRESS) Failed");
-		*mac_address = NULL;
-		return FALSE;
+	} else {
+		tmp_mac = vconf_get_str(VCONFKEY_WIFI_BSSID_ADDRESS);
+		if (tmp_mac == NULL) {
+			ERR("vconf_get_str(WIFI_BSSID_ADDRESS) Failed");
+			*mac_address = NULL;
+			return FALSE;
+		}
 	}
-#endif
 	tmp = g_ascii_strdown(tmp_mac, (gssize)strlen(tmp_mac));
 	g_free(tmp_mac);
 	while (tmp && tmp[i]) {
@@ -737,6 +738,12 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
 
 	ret = __get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
 	if (ret != TRUE) {
+		g_free(conf->name);
+		g_free(conf->ssid);
+		g_free(conf->passphrase);
+		g_free(conf->is_hidden);
+		g_free(conf->proxy_address);
+		g_free(conf);
 		ERR("Fail to get_wifi_config_group_name");
 		return FALSE;
 	}