Fix connman_wifi_load_ssid

The returned string array must be NULL terminated, and the groups array
should be freed as well.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/wifi.c b/src/wifi.c
index e645969b..3bc9050d 100644
--- a/src/wifi.c
+++ b/src/wifi.c
@@ -68,12 +68,10 @@ char **connman_wifi_load_ssid(void)
 		return NULL;
 
 	groups = g_key_file_get_groups(key_file, &num_groups);
-	if (groups == NULL) {
-		hex_ssids = NULL;
-		goto done;
-	}
 
-	hex_ssids = g_try_malloc0(sizeof(*hex_ssids) * num_groups);
+	hex_ssids = g_try_malloc0(sizeof(*hex_ssids) * (num_groups + 1));
+	if (hex_ssids == NULL)
+		goto done;
 
 	for (i = 0, j = 0; groups[i]; i++) {
 		gchar *hex_ssid;
@@ -94,7 +92,11 @@ char **connman_wifi_load_ssid(void)
 		hex_ssids[j++] = hex_ssid;
 	}
 
+	hex_ssids[j] = NULL;
+
 done:
+	g_strfreev(groups);
+
 	__connman_storage_close_profile(profile, key_file, FALSE);
 
 	return hex_ssids;