Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: assert that the memcpy upload path points to valid regions 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-09-14 13:06:26 +01:00
parent 8396105178
commit 4d4aca21fd
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sna/blt.c
View File

@ -50,6 +50,8 @@ memcpy_blt(const void *src, void *dst, int bpp,
assert(width && height);
assert(bpp >= 8);
assert((src_x + width) * bpp <= 8 * src_stride);
assert((dst_x + width) * bpp <= 8 * dst_stride);
DBG(("%s: src=(%d, %d), dst=(%d, %d), size=%dx%d, pitch=%d/%d\n",
__FUNCTION__, src_x, src_y, dst_x, dst_y, width, height, src_stride, dst_stride));

10
src/sna/sna_accel.c
View File

@ -1053,6 +1053,16 @@ sna_put_image_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
box = REGION_RECTS(region);
n = REGION_NUM_RECTS(region);
do {
assert(box->x1 >= 0);
assert(box->y1 >= 0);
assert(box->x2 <= pixmap->drawable.width);
assert(box->y2 <= pixmap->drawable.height);
assert(box->x1 - x >= 0);
assert(box->y1 - y >= 0);
assert(box->x2 - x <= w);
assert(box->y2 - y <= h);
memcpy_blt(bits, dst_bits,
pixmap->drawable.bitsPerPixel,
stride, dst_stride,