The Tor Browser / file comparison
comparison: gfx/cairo/d2d-gradient-ensure-stops.patch
gfx/cairo/d2d-gradient-ensure-stops.patch
- branch
- TOR_BUG_9701
- changeset 8
- 97036ab72558
equal
deleted
inserted
replaced
| -1:000000000000 | 0:1a851c964a37 |
|---|---|
| 1 # HG changeset patch | |
| 2 # User Robert O'Callahan <robert@ocallahan.org> | |
| 3 # Date 1348618772 -43200 | |
| 4 # Node ID 55ccbc8d52e69b020f2ba493e92ad2e214388df0 | |
| 5 # Parent e0d69219dd2b3b2826d186dc99c673b879409ea6 | |
| 6 Bug 792903. Prevent num_stops from being set to zero. r=bas | |
| 7 | |
| 8 diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp | |
| 9 --- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp | |
| 10 +++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp | |
| 11 @@ -1641,17 +1641,20 @@ static RefPtr<ID2D1Brush> | |
| 12 min_dist = MIN(_cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_left, p1)), | |
| 13 _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_right, p1))); | |
| 14 min_dist = MIN(min_dist, _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(bottom_left, p1))); | |
| 15 min_dist = MIN(min_dist, _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(bottom_right, p1))); | |
| 16 | |
| 17 min_dist = MAX(-min_dist, 0); | |
| 18 | |
| 19 // Repeats after gradient start. | |
| 20 - int after_repeat = (int)ceil(max_dist / gradient_length); | |
| 21 + // It's possible for max_dist and min_dist to both be zero, in which case | |
| 22 + // we'll set num_stops to 0 and crash D2D. Let's just ensure after_repeat | |
| 23 + // is at least 1. | |
| 24 + int after_repeat = MAX((int)ceil(max_dist / gradient_length), 1); | |
| 25 int before_repeat = (int)ceil(min_dist / gradient_length); | |
| 26 num_stops *= (after_repeat + before_repeat); | |
| 27 | |
| 28 p2.x = p1.x + u.x * after_repeat * gradient_length; | |
| 29 p2.y = p1.y + u.y * after_repeat * gradient_length; | |
| 30 p1.x = p1.x - u.x * before_repeat * gradient_length; | |
| 31 p1.y = p1.y - u.y * before_repeat * gradient_length; | |
| 32 |
