[maemo-commits] [maemo-commits] r15520 - in projects/haf/trunk/maemo-launcher: . debian launcher

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2008-05-08 13:44:12 +0300 (Thu, 08 May 2008)
New Revision: 15520

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/debian/changelog
   projects/haf/trunk/maemo-launcher/launcher/launcher.c
Log:
Fix memory leaks for comm_msg from the upgrade in-place support

(Fixes: NB#84534)


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2008-05-08 10:44:10 UTC (rev 15519)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2008-05-08 10:44:12 UTC (rev 15520)
@@ -1,5 +1,10 @@
 2008-04-23  Guillem Jover  <guillem.jover at nokia.com>
 
+	* launcher/launcher.c (store_state): Call comm_msg_destroy.
+	(load_state): Likewise.
+
+2008-04-23  Guillem Jover  <guillem.jover at nokia.com>
+
 	* configure.ac: Bump version to 0.28~.
 
 2008-04-15  Guillem Jover  <guillem.jover at nokia.com>

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2008-05-08 10:44:10 UTC (rev 15519)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2008-05-08 10:44:12 UTC (rev 15520)
@@ -1,6 +1,8 @@
 maemo-launcher (0.28-1) UNRELEASED; urgency=low
 
   * New Upstream Release.
+    - Fix memory leaks for comm_msg from the upgrade in-place support.
+      (Fixes: NB#84534)
 
  -- Guillem Jover <guillem.jover at nokia.com>  Wed, 23 Apr 2008 21:29:09 +0300
 

Modified: projects/haf/trunk/maemo-launcher/launcher/launcher.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/launcher.c	2008-05-08 10:44:10 UTC (rev 15519)
+++ projects/haf/trunk/maemo-launcher/launcher/launcher.c	2008-05-08 10:44:12 UTC (rev 15520)
@@ -580,6 +580,7 @@
 
   comm_msg_send(fd, msg);
 
+  comm_msg_destroy(msg);
   close(fd);
 
   return true;
@@ -613,6 +614,8 @@
   if (LAUNCHER_STATE_SIG != magic)
   {
     error("wrong signature on persistence file '%s'\n", statefilename);
+    comm_msg_destroy(msg);
+
     return NULL;
   }
 
@@ -631,6 +634,8 @@
     list[i].name = strdup(s);
   }
 
+  comm_msg_destroy(msg);
+
   return childs;
 }