diff -up metacity-2.23.610/src/ui/ui.c.string-leak metacity-2.23.610/src/ui/ui.c --- metacity-2.23.610/src/ui/ui.c.string-leak 2008-08-18 08:29:07.000000000 -0400 +++ metacity-2.23.610/src/ui/ui.c 2008-09-15 18:05:20.000000000 -0400 @@ -657,10 +657,12 @@ meta_text_property_to_utf8 (Display &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);