Fix memory leak

Change-Id: Ifbe1055fd4e606ead7df3a4d4d54fba8fcdf8e6f
Signed-off-by: INSUN PYO <insun.pyo@samsung.com>
(cherry picked from commit e36002b66edaf3e100b2cdaa0016218bedac1a5f)

diff --git a/src/memory/memory-killer.c b/src/memory/memory-killer.c
index 43834c44650b20eb13214663b20afafe16f4af78..3e954c297c8157a8e886eaf4ac77beac4867750e 100644 (file)
--- a/src/memory/memory-killer.c
+++ b/src/memory/memory-killer.c
@@ -252,7 +252,7 @@ retain_memory:
        candidates = g_slist_sort(candidates, memory_killer_compare_func);
 
        _I("Low memory. Start to retain memory");
-       G_SLIST_FOREACH_WITH_REMOVE(candidates, candidate) {
+       G_SLIST_FOREACH(candidates, candidate) {
                g_assert(candidate);
 
                if (g_hash_table_contains(memory_killer_whitelist, candidate->basename))
@@ -286,7 +286,7 @@ retain_memory:
                        break;
                }
        }
-       g_slist_free(candidates);
+       g_slist_free_full(candidates, g_free);
        candidates = NULL;
 
        if (range == MEMORY_KILLER_RANGE_ONLY_APP && need_to_retain > 0) {

diff --git a/src/proc-usage/proc-usage-application.c b/src/proc-usage/proc-usage-application.c
index 16a30d27afcf995ac087f290a35a10c91b76a9a4..105a7d396eb848df51ed758d1f8861efff428f6a 100644 (file)
--- a/src/proc-usage/proc-usage-application.c
+++ b/src/proc-usage/proc-usage-application.c
@@ -130,7 +130,7 @@ GVariant *proc_usage_application_get_all_memory_usages(void)
 
        g_variant_builder_init(&builder, G_VARIANT_TYPE("a(su)"));
 
-       G_SLIST_FOREACH_WITH_REMOVE(applist, app) {
+       G_SLIST_FOREACH(applist, app) {
                g_assert(app);
 
                /* Ignore invalid app */
@@ -151,7 +151,7 @@ GVariant *proc_usage_application_get_all_memory_usages(void)
                g_assert(appusage);
                g_variant_builder_add_value(&builder, appusage);
        }
-       g_slist_free(applist);
+       g_slist_free_full(applist, g_free);
 
        return g_variant_new("(a(su))", &builder);
 }
@@ -192,7 +192,7 @@ GVariant *proc_usage_application_get_all_cpu_usages(void)
 
        g_variant_builder_init(&builder, G_VARIANT_TYPE("a(su)"));
 
-       G_SLIST_FOREACH_WITH_REMOVE(applist, app) {
+       G_SLIST_FOREACH(applist, app) {
                g_assert(app);
 
                /* Ignore invalid app */
@@ -221,7 +221,7 @@ GVariant *proc_usage_application_get_all_cpu_usages(void)
 
                g_variant_builder_add_value(&builder, appusage);
        }
-       g_slist_free(applist);
+       g_slist_free_full(applist, g_free);
 
        return g_variant_new("(a(su))", &builder);
 }