diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-01-14 05:17:09 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-01-14 05:17:09 +0000 |
| commit | 171afc0d5c78311543c78cc9aa0c068cbee8e9f5 (patch) | |
| tree | 733790059e40b3881213d55c5984c41c98f47d97 | |
| parent | 23d0867f6c47c7c18a5a8ae790685c7cba8ea54d (diff) | |
| download | gdk-pixbuf-171afc0d5c78311543c78cc9aa0c068cbee8e9f5.tar.gz | |
Plug memory leaks. (#396160, Carlos Garcia Campos)
2007-01-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkselection.c (_gtk_selection_request): Plug
memory leaks. (#396160, Carlos Garcia Campos)
svn path=/branches/gtk-2-10/; revision=17146
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gtk/gtkselection.c | 3 |
2 files changed, 10 insertions, 0 deletions
@@ -1,6 +1,13 @@ 2007-01-13 Matthias Clasen <mclasen@redhat.com> Merge from trunk: + + * gtk/gtkselection.c (_gtk_selection_request): Plug + memory leaks. (#396160, Carlos Garcia Campos) + +2007-01-13 Matthias Clasen <mclasen@redhat.com> + + Merge from trunk: * configure.in: Link libgtk against Xfixes. (#396074, Tommi Komulainen) diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 5715b50f4..7bb156b2b 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -2132,6 +2132,7 @@ _gtk_selection_request (GtkWidget *widget, event->time); g_free (mult_atoms); g_free (info); + gdk_error_trap_pop (); return TRUE; } gdk_error_trap_pop (); @@ -2168,6 +2169,8 @@ _gtk_selection_request (GtkWidget *widget, info->conversions[i].target = ((GdkAtom *)mult_atoms)[2*i]; info->conversions[i].property = ((GdkAtom *)mult_atoms)[2*i+1]; } + + g_free (mult_atoms); } } else /* only a single conversion */ |