diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-08-29 04:37:11 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-08-29 04:37:11 +0000 |
| commit | 767cd6abd9b8cddb20daf3a2131f3083b21b3543 (patch) | |
| tree | 24b73228467ce4e6e3f5cb378b6593e91f23f0c9 | |
| parent | 045b188be075d5f092e935a92931c8afb35ecca5 (diff) | |
| download | gdk-pixbuf-767cd6abd9b8cddb20daf3a2131f3083b21b3543.tar.gz | |
Free state.children in all cases. (#313862, Kjartan Maraas)
2005-08-29 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkasync.c (_gdk_x11_get_window_child_info): Free
state.children in all cases. (#313862, Kjartan Maraas)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | gdk/x11/gdkasync.c | 9 |
3 files changed, 20 insertions, 3 deletions
@@ -1,7 +1,12 @@ +2005-08-29 Matthias Clasen <mclasen@redhat.com> + + * gdk/x11/gdkasync.c (_gdk_x11_get_window_child_info): Free + state.children in all cases. (#313862, Kjartan Maraas) + 2005-08-27 Matthias Clasen <mclasen@redhat.com> * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Fix the default - value of the ui property. + value of the ui property. (#314532, Yong Wang) * gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn when G_MAXLONG is passed as length. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d80c77d01..0c3d0979f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,7 +1,12 @@ +2005-08-29 Matthias Clasen <mclasen@redhat.com> + + * gdk/x11/gdkasync.c (_gdk_x11_get_window_child_info): Free + state.children in all cases. (#313862, Kjartan Maraas) + 2005-08-27 Matthias Clasen <mclasen@redhat.com> * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Fix the default - value of the ui property. + value of the ui property. (#314532, Yong Wang) * gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn when G_MAXLONG is passed as length. diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c index d0cf7e94b..e360bf1a1 100644 --- a/gdk/x11/gdkasync.c +++ b/gdk/x11/gdkasync.c @@ -626,6 +626,9 @@ _gdk_x11_get_window_child_info (GdkDisplay *display, else wm_state_atom = None; + state.children = NULL; + state.nchildren = 0; + gdk_error_trap_push (); result = list_children_and_wm_state (dpy, window, win_has_wm_state ? wm_state_atom : None, @@ -633,12 +636,16 @@ _gdk_x11_get_window_child_info (GdkDisplay *display, &state.children, &state.nchildren); gdk_error_trap_pop (); if (!result) - return FALSE; + { + g_free (state.children); + return FALSE; + } if (has_wm_state) { if (win_has_wm_state) *win_has_wm_state = TRUE; + g_free (state.children); return TRUE; } else |