free the result of gdk_text_property_to_utf8_list() even when it returns

	* src/ui/ui.c: free the result of gdk_text_property_to_utf8_list()
          even when it returns no data.


svn path=/trunk/; revision=4093

2 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index d5cb66c9..a8d60d22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-27  Matthias Claesen <mclasen@redhat.com>
+
+	* src/ui/ui.c: free the result of gdk_text_property_to_utf8_list()
+          even when it returns no data.
+
 2009-01-27  Owen Taylor  <otaylor@redhat.com>
 
        GtkStyle is specific to a particular colormap. Metacity
diff --git a/src/ui/ui.c b/src/ui/ui.c
index 010130c0..6df289f6 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -671,10 +671,12 @@ meta_text_property_to_utf8 (Display             *xdisplay,
                                           &list);
 
   if (count == 0)
-    return NULL;
-
-  retval = list[0];
-  list[0] = g_strdup (""); /* something to free */
+    retval = NULL;
+  else
+    {
+      retval = list[0];
+      list[0] = g_strdup (""); /* something to free */
+    }
   
   g_strfreev (list);