Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make _gdk_window_process_updates_recurse reentrancy safe

Browse Source 
Apps may change the window hierarchy while recursing over it by
destroying windows from the expose event handler. We need to copy
the children list and ref all the children while recursing.

This fixes some crashers in gedit (bug #589367, bug #591434)
This commit is contained in:
Alexander Larsson
2009-08-13 17:00:00 +02:00
parent 7667c4d8dc
commit 9f82243197
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gdk/gdkwindow.c
View File

@@ -4751,17 +4751,21 @@ _gdk_window_process_updates_recurse (GdkWindow *window,
GdkWindowObject *child;
GdkRegion *child_region;
GdkRectangle r;
GList *l;
GList *l, *children;
if (gdk_region_empty (expose_region))
return;
/* Make this reentrancy safe for expose handlers freeing windows */
children = g_list_copy (private->children);
g_list_foreach (children, g_object_ref, NULL);
/* Iterate over children, starting at topmost */
for (l = private->children; l != NULL; l = l->next)
for (l = children; l != NULL; l = l->next)
{
child = l->data;
if (!GDK_WINDOW_IS_MAPPED (child) || child->input_only || child->composited)
if (child->destroyed || !GDK_WINDOW_IS_MAPPED (child) || child->input_only || child->composited)
continue;
/* Ignore offscreen children, as they don't draw in their parent and
@@ -4799,6 +4803,9 @@ _gdk_window_process_updates_recurse (GdkWindow *window,
gdk_region_destroy (child_region);
}
g_list_foreach (children, g_object_unref, NULL);
g_list_free (children);
if (!gdk_region_empty (expose_region))
{
if (private->event_mask & GDK_EXPOSURE_MASK)