diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2008-05-15 20:03:05 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2008-05-15 20:03:05 -0400 |
| commit | 556b16d6a20f11627c75c1365dea5a6332091779 (patch) | |
| tree | 8c3cabb6d6ce1611ee9160f606355052365fc710 /src/cairo-traps.c | |
| parent | b355ac7a9fe8ecf550ec5f615969b82f0e45a6d6 (diff) | |
[cairo-traps] Fix overflow in traps_path code
This was causing the user-font test failure in type1 subsetting
code as the type1 code creates a font at size 1000.
Diffstat (limited to 'src/cairo-traps.c')
| -rw-r--r-- | src/cairo-traps.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/cairo-traps.c b/src/cairo-traps.c index 91bb9269..fcb02088 100644 --- a/src/cairo-traps.c +++ b/src/cairo-traps.c @@ -660,18 +660,19 @@ _cairo_traps_extract_region (const cairo_traps_t *traps, /* moves trap points such that they become the actual corners of the trapezoid */ static void -_sanitize_trap (cairo_trapezoid_t *trap) +_sanitize_trap (cairo_trapezoid_t *t) { -/* XXX the math here is fragile. can overflow in extreme cases */ -#define FIX(t, lr, tb, p) \ + cairo_trapezoid_t s = *t; + +#define FIX(lr, tb, p) \ if (t->lr.p.y != t->tb) { \ - t->lr.p.x = t->lr.p2.x + (t->lr.p1.x - t->lr.p2.x) * (t->tb - t->lr.p2.y) / (t->lr.p1.y - t->lr.p2.y); \ - t->lr.p.y = t->tb; \ + t->lr.p.x = s.lr.p2.x + _cairo_fixed_mul_div (s.lr.p1.x - s.lr.p2.x, s.tb - s.lr.p2.y, s.lr.p1.y - s.lr.p2.y); \ + t->lr.p.y = s.tb; \ } - FIX (trap, left, top, p1); - FIX (trap, left, bottom, p2); - FIX (trap, right, top, p1); - FIX (trap, right, bottom, p2); + FIX (left, top, p1); + FIX (left, bottom, p2); + FIX (right, top, p1); + FIX (right, bottom, p2); } cairo_private cairo_status_t |