diff --git a/ChangeLog b/ChangeLog
index 9416ab87fa..2a1719b2df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* 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  <kris@imendio.com>
 
 	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered):
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9416ab87fa..2a1719b2df 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2006-02-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* 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  <kris@imendio.com>
 
 	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered):
diff --git a/gdk/gdkregion-generic.c b/gdk/gdkregion-generic.c
index 2d1524bbcb..8d3ee40b07 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;