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

sna/trapezoids: Restore overflow check 

The range can indeed overflow, so promote the assertion back into a
check.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-10-07 10:30:20 +01:00
parent d462475b7e
commit 1c651848cc
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sna/sna_trapezoids_imprecise.c
View File

@ -467,7 +467,8 @@ polygon_init(struct polygon *polygon,
unsigned num_buckets =
EDGE_Y_BUCKET_INDEX(ymax+EDGE_Y_BUCKET_HEIGHT-1, ymin);
assert(ymax-ymin < 0x7FFFFFFFU - EDGE_Y_BUCKET_HEIGHT);
if (unlikely(ymax - ymin > 0x7FFFFFFFU - EDGE_Y_BUCKET_HEIGHT))
return false;
polygon->edges = polygon->edges_embedded;
polygon->y_buckets = polygon->y_buckets_embedded;
@ -936,8 +937,8 @@ tor_init(struct tor *converter, const BoxRec *box, int num_edges)
active_list_reset(converter->active);
if (!polygon_init(converter->polygon, num_edges,
box->y1 * FAST_SAMPLES_Y,
box->y2 * FAST_SAMPLES_Y)) {
(int)box->y1 * FAST_SAMPLES_Y,
(int)box->y2 * FAST_SAMPLES_Y)) {
cell_list_fini(converter->coverages);
return false;
}

5
src/sna/sna_trapezoids_precise.c
View File

@ -481,7 +481,8 @@ polygon_init(struct polygon *polygon,
unsigned num_buckets =
EDGE_Y_BUCKET_INDEX(ymax+EDGE_Y_BUCKET_HEIGHT-1, ymin);
assert(ymax - ymin < 0x7FFFFFFFU - EDGE_Y_BUCKET_HEIGHT);
if (unlikely(ymax - ymin > 0x7FFFFFFFU - EDGE_Y_BUCKET_HEIGHT))
return false;
polygon->edges = polygon->edges_embedded;
polygon->y_buckets = polygon->y_buckets_embedded;
@ -942,7 +943,7 @@ tor_init(struct tor *converter, const BoxRec *box, int num_edges)
active_list_reset(converter->active);
if (!polygon_init(converter->polygon, num_edges,
box->y1 * SAMPLES_Y, box->y2 * SAMPLES_Y)) {
(int)box->y1 * SAMPLES_Y, (int)box->y2 * SAMPLES_Y)) {
cell_list_fini(converter->coverages);
return false;
}