From ba6a8de6649e034d25e7a2dba5f16a2164ef26b1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 17 Feb 2006 15:41:27 +0000 Subject: [PATCH] Be robust and reject rectangles with negative width or height. (#331467, 2006-02-17 Matthias Clasen * gdk/gdkregion-generic.c (gdk_region_union_with_rect): Be robust and reject rectangles with negative width or height. (#331467, Benjamin Berg) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gdk/gdkregion-generic.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9416ab87f..2a1719b2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-02-17 Matthias Clasen + + * gdk/gdkregion-generic.c (gdk_region_union_with_rect): + Be robust and reject rectangles with negative width or + height. (#331467, Benjamin Berg) + + 2006-02-17 Kristian Rietveld * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9416ab87f..2a1719b2d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2006-02-17 Matthias Clasen + + * gdk/gdkregion-generic.c (gdk_region_union_with_rect): + Be robust and reject rectangles with negative width or + height. (#331467, Benjamin Berg) + + 2006-02-17 Kristian Rietveld * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered): diff --git a/gdk/gdkregion-generic.c b/gdk/gdkregion-generic.c index 2d1524bbc..8d3ee40b0 100644 --- a/gdk/gdkregion-generic.c +++ b/gdk/gdkregion-generic.c @@ -248,7 +248,7 @@ gdk_region_union_with_rect (GdkRegion *region, g_return_if_fail (region != NULL); g_return_if_fail (rect != NULL); - if (!rect->width || !rect->height) + if (rect->width <= 0 || rect->height <= 0) return; tmp_region.rects = &tmp_region.extents;