[maemo-commits] [maemo-commits] r19126 - in projects/haf/trunk/libmatchbox2: . matchbox/core

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-08-12 14:54:05 +0300 (Wed, 12 Aug 2009)
New Revision: 19126

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
Log:
plug a memory leak


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-08-12 10:03:02 UTC (rev 19125)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-08-12 11:54:05 UTC (rev 19126)
@@ -1,3 +1,11 @@
+2009-08-12  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	Patch a Coverity-found issue.
+
+	* matchbox/core/mb-wm-client-window.c
+	(mb_wm_client_window_sync_properties): Free 'l' if
+	icon_from_net_wm_icon returns zero.
+
 2009-08-11  Gordon Williams <gordon.williams at collabora.co.uk>
 
 	* matchbox/core/mb-wm-client-window.c: Removed the Monster Hack again,

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-08-12 10:03:02 UTC (rev 19125)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-08-12 11:54:05 UTC (rev 19126)
@@ -1059,9 +1059,13 @@
 	  while (p < p_end)
 	    {
 	      l = mb_wm_util_malloc0 (sizeof (MBWMList));
-	      if ((p = icon_from_net_wm_icon (p, &l->data)) == 0)
-                /* zero return in case of OOM or too big icon */
-                break;
+	      if (!l || (p = icon_from_net_wm_icon (p, &l->data)) == 0)
+                {
+                  /* zero return in case of OOM or too big icon */
+                  if (l)
+                    free (l);
+                  break;
+                }
 
 	      if (list_end)
 		{