Bug 589275 – [csw] Trying to destroy NULL regions

gdk_window_input_shape_combine_mask() can accept NULL for the mask
parameter, but it wasn't checking for NULL before passing the
resulting GdkRegion to gdk_region_destroy().  Fixes #589275
This commit is contained in:
Cody Russell 2009-07-21 11:44:25 -05:00
parent 18048308e4
commit d84b575cd0

View File

@ -7392,7 +7392,7 @@ gdk_window_merge_child_shapes (GdkWindow *window)
/**
* gdk_window_input_shape_combine_mask:
* @window: a #GdkWindow
* @mask: shape mask
* @mask: shape mask, or %NULL
* @x: X position of shape mask with respect to @window
* @y: Y position of shape mask with respect to @window
*
@ -7437,7 +7437,8 @@ gdk_window_input_shape_combine_mask (GdkWindow *window,
region,
x, y);
gdk_region_destroy (region);
if (region != NULL)
gdk_region_destroy (region);
}
/**