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

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2007-10-03 15:13:13 +0300 (Wed, 03 Oct 2007)
New Revision: 14299

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 leak when failing to allocate the childs structure.


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2007-10-03 12:02:33 UTC (rev 14298)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2007-10-03 12:13:13 UTC (rev 14299)
@@ -1,5 +1,10 @@
 2007-10-03  Guillem Jover  <guillem.jover at nokia.com>
 
+	* launcher/launcher.c (alloc_childs): Free childs in case the malloc
+	for childs->list failed.
+
+2007-10-03  Guillem Jover  <guillem.jover at nokia.com>
+
 	* configure.ac: Bump version to 0.26~.
 
 2007-09-25  Guillem Jover  <guillem.jover at nokia.com>

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2007-10-03 12:02:33 UTC (rev 14298)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2007-10-03 12:13:13 UTC (rev 14299)
@@ -1,6 +1,7 @@
 maemo-launcher (0.26-1) UNRELEASED; urgency=low
 
   * New Upstream Release.
+    - Fix memory leak when failing to allocate the childs structure.
 
  -- Guillem Jover <guillem.jover at nokia.com>  Wed, 03 Oct 2007 14:57:15 +0300
 

Modified: projects/haf/trunk/maemo-launcher/launcher/launcher.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/launcher.c	2007-10-03 12:02:33 UTC (rev 14298)
+++ projects/haf/trunk/maemo-launcher/launcher/launcher.c	2007-10-03 12:13:13 UTC (rev 14299)
@@ -375,6 +375,7 @@
   if (!childs->list)
   {
     error("allocating a child list\n");
+    free(childs);
     return NULL;
   }