fix memory leak at on_manager_getmodems()

Change-Id: I6aa4f41d844b0270a9906ff1538eeddd7ba9d194

diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec
index f641ad90250e2492307d5bde572b1c44855cd2d3..8fa6388c836e59e8a13d2c4a1cd3d7fefe24140c 100644 (file)
--- a/packaging/tel-plugin-dbus_tapi.spec
+++ b/packaging/tel-plugin-dbus_tapi.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 73
+%define patchlevel 74
 
 Name:           tel-plugin-dbus_tapi
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/dtapi_main.c b/src/dtapi_main.c
index b901fb49620bdfab123e8221c3738230959a11f9..face919f98f5273ab02f51ce66923cc676f12d12 100644 (file)
--- a/src/dtapi_main.c
+++ b/src/dtapi_main.c
@@ -218,9 +218,10 @@ static gboolean on_manager_getmodems(TelephonyManager *mgr,
 {
        struct custom_data *ctx = user_data;
        GSList *cp_name_list;
+       GSList *cp_name_list_temp;
        gchar **list;
        const char *name = NULL;
-       int count;
+       int count, index;
 
        cp_name_list = tcore_server_get_cp_name_list(ctx->server);
        if (cp_name_list == NULL) {
@@ -240,22 +241,23 @@ static gboolean on_manager_getmodems(TelephonyManager *mgr,
                return TRUE;
        }
 
-       count = 0;
-       for ( ; cp_name_list ; cp_name_list = cp_name_list->next) {
-               name = cp_name_list->data;
-               list[count] = g_strdup(name);
-               dbg("list[%d]: %s", count, list[count]);
-               count++;
+       /*
+        * fix memory leak
+        *  - Shouldn't move directly GSList pointer which is allocated in g_slist_append().
+        *  - It cause memory leak.
+        */
+       for (index = 0; index < count; index++) {
+               cp_name_list_temp = g_slist_nth(cp_name_list, index);
+               if(cp_name_list_temp == NULL)
+                       continue;
+               list[index] = g_strdup(cp_name_list_temp->data);
+               dbg("list[%d]: %s", index, list[index]);
        }
 
        telephony_manager_complete_get_modems(mgr, invocation, (const gchar **)list);
 
        /* Free memory */
-       for (; count >= 0; count--)
-               g_free(list[count]);
-       g_free(list);
-
-       /* Freeing the received list of CP names */
+       g_strfreev(list);
        g_slist_free_full(cp_name_list, g_free);
 
        return TRUE;