diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2009-02-09 22:38:51 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2009-02-09 22:38:51 +0000 |
commit | 8bd9bbb228c4ab6dc8e2448084b7c6d17e156b9c (patch) | |
tree | 875a23c146444401d2141ebcf00631022256fcbe /x11-wm/metacity/files | |
parent | Bump to 0.8-r1. Better defaults for vfat, bug #257745. Fix HAL locking for de... (diff) | |
download | gentoo-2-8bd9bbb228c4ab6dc8e2448084b7c6d17e156b9c.tar.gz gentoo-2-8bd9bbb228c4ab6dc8e2448084b7c6d17e156b9c.tar.bz2 gentoo-2-8bd9bbb228c4ab6dc8e2448084b7c6d17e156b9c.zip |
Bump to 2.24.0-r2. Fix a leak misused gslist function, bug #258301. Fix a string leak, bug #258302.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm/metacity/files')
-rw-r--r-- | x11-wm/metacity/files/metacity-2.24.0-gslist-leak.patch | 15 | ||||
-rw-r--r-- | x11-wm/metacity/files/metacity-2.24.0-string-leak.patch | 21 |
2 files changed, 36 insertions, 0 deletions
diff --git a/x11-wm/metacity/files/metacity-2.24.0-gslist-leak.patch b/x11-wm/metacity/files/metacity-2.24.0-gslist-leak.patch new file mode 100644 index 000000000000..39c35087e4c7 --- /dev/null +++ b/x11-wm/metacity/files/metacity-2.24.0-gslist-leak.patch @@ -0,0 +1,15 @@ +# https://bugs.gentoo.org/attachment.cgi?id=181415 +diff -up a/src/core/edge-resistance.c b/src/core/edge-resistance.c +--- a/src/core/edge-resistance.c 2008-09-14 22:39:38.000000000 -0400 ++++ b/src/core/edge-resistance.c 2008-09-14 22:43:28.000000000 -0400 +@@ -985,8 +985,8 @@ meta_display_compute_resistance_and_snap + cur_window_iter = cur_window_iter->next; + } + /* Put 'em in bottom to top order */ +- rem_windows = g_slist_reverse (obscuring_windows); +- rem_win_stacking = g_slist_reverse (window_stacking); ++ rem_windows = obscuring_windows = g_slist_reverse (obscuring_windows); ++ rem_win_stacking = window_stacking = g_slist_reverse (window_stacking); + + /* + * 3rd: loop over the windows again, this time getting the edges from diff --git a/x11-wm/metacity/files/metacity-2.24.0-string-leak.patch b/x11-wm/metacity/files/metacity-2.24.0-string-leak.patch new file mode 100644 index 000000000000..e2cd71771377 --- /dev/null +++ b/x11-wm/metacity/files/metacity-2.24.0-string-leak.patch @@ -0,0 +1,21 @@ +# https://bugs.gentoo.org/show_bug.cgi?id=258302 +diff -up a/src/ui/ui.c b/src/ui/ui.c +--- a/src/ui/ui.c 2008-08-18 08:29:07.000000000 -0400 ++++ b/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); + |