pixman: Branch 'master'

[Benjamin Otte]

 pixman/pixman-region.c |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

New commits:
commit d4b22bd9935662912641abe5fd010d906c839405
Author: Benjamin Otte <otte at gnome.org>
Date:   Tue Jul 21 00:49:40 2009 +0200

    Add a lot more sanity checks to region code
    
    - Introduce a GOOD_RECT() macro that checks that a pixman_box_t is not
      empty or degenerate an use it.
    - Use GOOD_RECT() instead of magic if statements for funtions that take
      x, y, width, height arguments
    - Use GOOD_RECT() in _reset(). The checks in the previous code seemed to
      allow an empty box, but then created a broken region from it.
    - Add GOOD(region) check at the end of _translate()

diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c
index cb8f1aa..7820b94 100644
--- a/pixman/pixman-region.c
+++ b/pixman/pixman-region.c
@@ -63,6 +63,7 @@
 #define PIXREGION_TOP(reg) PIXREGION_BOX (reg, (reg)->data->numRects)
 #define PIXREGION_END(reg) PIXREGION_BOX (reg, (reg)->data->numRects - 1)
 
+#define GOOD_RECT(rect) ((rect)->x1 < (rect)->x2 && (rect)->y1 < (rect)->y2)
 #define GOOD(reg) assert (PREFIX (_selfcheck) (reg))
 
 static const box_type_t PREFIX (_empty_box_) = { 0, 0, 0, 0 };
@@ -339,24 +340,24 @@ PREFIX (_init_rect) (region_type_t *	region,
 		     unsigned int	width,
 		     unsigned int	height)
 {
-    if (x + (int) width < x || y + (int) height < y)
-    {
-        PREFIX (_init) (region);
-        return;
-    }
-
     region->extents.x1 = x;
     region->extents.y1 = y;
     region->extents.x2 = x + width;
     region->extents.y2 = y + height;
 
+    if (!GOOD_RECT (&region->extents))
+    {
+        PREFIX (_init) (region);
+        return;
+    }
+
     region->data = NULL;
 }
 
 PIXMAN_EXPORT void
 PREFIX (_init_with_extents) (region_type_t *region, box_type_t *extents)
 {
-    if (extents->x1 >= extents->x2 || extents->y1 > extents->y2)
+    if (!GOOD_RECT (extents))
     {
         PREFIX (_init) (region);
         return;
@@ -1303,14 +1304,14 @@ PREFIX (_union_rect) (region_type_t *dest,
 {
     region_type_t region;
 
-    if (!width || !height)
-	return PREFIX (_copy) (dest, source);
-    
     region.extents.x1 = x;
     region.extents.y1 = y;
     region.extents.x2 = x + width;
     region.extents.y2 = y + height;
 
+    if (!GOOD_RECT (&region.extents))
+	return PREFIX (_copy) (dest, source);
+    
     region.data = NULL;
 
     return PREFIX (_union) (dest, source, &region);
@@ -2240,6 +2241,8 @@ PREFIX (_translate) (region_type_t *region, int x, int y)
 	    }
 	}
     }
+
+    GOOD (region);
 }
 
 PIXMAN_EXPORT void
@@ -2247,14 +2250,13 @@ PREFIX (_reset) (region_type_t *region, box_type_t *box)
 {
     GOOD (region);
 
-    assert (box->x1 <= box->x2);
-    assert (box->y1 <= box->y2);
+    assert (GOOD_RECT (box));
 
     region->extents = *box;
 
     FREE_DATA (region);
 
-    region->data = (region_data_type_t *)NULL;
+    region->data = NULL;
 }
 
 /* box is "return" value */