diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-04-14 16:48:05 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-04-14 16:48:05 +0100 |
| commit | fd700c37ee2a68262b1ccfff332dd41ba8599e2c (patch) | |
| tree | 227d2258bfbc049557a04f8c124c4bfbb78854da | |
| parent | 9ae82134ad14085e80d93592e155978a5056f44a (diff) | |
sna: Add some bounds checking asserts to damage
References: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1300640
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_damage.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/sna/sna_damage.c b/src/sna/sna_damage.c index f98c2827..d4b35159 100644 --- a/src/sna/sna_damage.c +++ b/src/sna/sna_damage.c @@ -155,6 +155,14 @@ static const char *_debug_describe_damage(char *buf, int max, } #endif +static struct sna_damage_box * +last_box(struct sna_damage *damage) +{ + return list_entry(damage->embedded_box.list.prev, + struct sna_damage_box, + list); +} + static void reset_embedded_box(struct sna_damage *damage) { @@ -242,9 +250,7 @@ static void __sna_damage_reduce(struct sna_damage *damage) if (damage->mode == DAMAGE_ADD) nboxes += REGION_NUM_RECTS(region); - iter = list_entry(damage->embedded_box.list.prev, - struct sna_damage_box, - list); + iter = last_box(damage); n = iter->size - damage->remain; boxes = (BoxRec *)(iter+1); DBG((" last box count=%d/%d, need=%d\n", n, iter->size, nboxes)); @@ -332,16 +338,13 @@ done: DBG((" reduce: after region.n=%ld\n", (long)REGION_NUM_RECTS(region))); } - static bool _sna_damage_create_boxes(struct sna_damage *damage, int count) { struct sna_damage_box *box; int n; - box = list_entry(damage->embedded_box.list.prev, - struct sna_damage_box, - list); + box = last_box(damage); n = 4*box->size; if (n < count) n = ALIGN(count, 64); @@ -388,6 +391,8 @@ restart: } DBG((" %s(): new elt\n", __FUNCTION__)); + assert(damage->remain == 0); + assert(damage->box - (BoxRec *)(last_box(damage)+1) == last_box(damage)->size); if (!_sna_damage_create_boxes(damage, count)) { unsigned mode; @@ -442,6 +447,8 @@ restart: } DBG((" %s(): new elt\n", __FUNCTION__)); + assert(damage->remain == 0); + assert(damage->box - (BoxRec *)(last_box(damage)+1) == last_box(damage)->size); if (!_sna_damage_create_boxes(damage, count)) { unsigned mode; @@ -502,6 +509,8 @@ restart: } DBG((" %s(): new elt\n", __FUNCTION__)); + assert(damage->remain == 0); + assert(damage->box - (BoxRec *)(last_box(damage)+1) == last_box(damage)->size); if (!_sna_damage_create_boxes(damage, count)) { unsigned mode; @@ -562,6 +571,8 @@ restart: } DBG((" %s(): new elt\n", __FUNCTION__)); + assert(damage->remain == 0); + assert(damage->box - (BoxRec *)(last_box(damage)+1) == last_box(damage)->size); if (!_sna_damage_create_boxes(damage, count)) { unsigned mode; @@ -1815,9 +1826,7 @@ void _sna_damage_debug_get_region(struct sna_damage *damage, RegionRec *r) if (damage->mode == DAMAGE_ADD) nboxes += REGION_NUM_RECTS(r); - iter = list_entry(damage->embedded_box.list.prev, - struct sna_damage_box, - list); + iter = last_box(damage); n = iter->size - damage->remain; boxes = malloc(sizeof(BoxRec)*nboxes); if (boxes == NULL) |