Merge "Fixed various memory leak issues" into tizen

2 files changed, 4 insertions, 1 deletions

diff --git a/src/dhcp.c b/src/dhcp.c
index 9a743626..e4497fcc 100755
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -462,11 +462,12 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
 	}
 
 	if (!apply_lease_available_on_network(dhcp_client, dhcp))
-		return;
+		goto done;
 
 	if (ip_change)
 		dhcp_valid(dhcp);
 
+done:
 	g_free(address);
 	g_free(netmask);
 	g_free(gateway);
diff --git a/src/service.c b/src/service.c
index adbb1bce..daf1a47f 100755
--- a/src/service.c
+++ b/src/service.c
@@ -680,6 +680,8 @@ static int service_load(struct connman_service *service)
 
 				connman_network_set_blob(service->network,
 					"WiFi.SSID", ssid, hex_ssid_len / 2);
+
+				g_free(ssid);
 			}
 
 			g_free(hex_ssid);