about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2014-06-24 22:25:00 +0100
committerJames Booth <boothj5@gmail.com>2014-06-24 22:25:00 +0100
commit7872d8e14f0ff3259484dc6e190b940e838d151d (patch)
treec521735b18f9302023db0c3dce61cefc18912167
parent98bc1abbe57214b6d78de94323b1433ab5fc753d (diff)
parent83fc97621c2828d1fcbe20e95d258fdaab71c9eb (diff)
downloadprofani-tty-7872d8e14f0ff3259484dc6e190b940e838d151d.tar.gz
Merge branch 'memleak'
-rw-r--r--src/contact.c1
-rw-r--r--src/ui/core.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/contact.c b/src/contact.c
index 52942bec..c57d1902 100644
--- a/src/contact.c
+++ b/src/contact.c
@@ -240,6 +240,7 @@ _get_most_available_resource(PContact contact)
 
         resources = g_list_next(resources);
     }
+    free(resources);
 
     return highest;
 }
diff --git a/src/ui/core.c b/src/ui/core.c
index 84fcebfd..254af048 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -137,6 +137,9 @@ _ui_get_idle_time(void)
         XFree(info);
         return result;
     }
+    if (info != NULL) {
+        XFree(info);
+    }
 // if no libxss or xss idle time failed, use profanity idle time
 #endif
     gdouble seconds_elapsed = g_timer_elapsed(ui_idle_time, NULL);