gfx/cairo/d2d-gradient-ensure-stops.patch@97036ab72558 (annotated)
gfx/cairo/d2d-gradient-ensure-stops.patch
Tue, 06 Jan 2015 21:39:09 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 06 Jan 2015 21:39:09 +0100
- branch
- TOR_BUG_9701
- changeset 8
- 97036ab72558
- permissions
- -rw-r--r--
Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.
| michael@0 | 1 | # HG changeset patch |
| michael@0 | 2 | # User Robert O'Callahan <robert@ocallahan.org> |
| michael@0 | 3 | # Date 1348618772 -43200 |
| michael@0 | 4 | # Node ID 55ccbc8d52e69b020f2ba493e92ad2e214388df0 |
| michael@0 | 5 | # Parent e0d69219dd2b3b2826d186dc99c673b879409ea6 |
| michael@0 | 6 | Bug 792903. Prevent num_stops from being set to zero. r=bas |
| michael@0 | 7 | |
| michael@0 | 8 | diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp |
| michael@0 | 9 | --- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp |
| michael@0 | 10 | +++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp |
| michael@0 | 11 | @@ -1641,17 +1641,20 @@ static RefPtr<ID2D1Brush> |
| michael@0 | 12 | min_dist = MIN(_cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_left, p1)), |
| michael@0 | 13 | _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_right, p1))); |
| michael@0 | 14 | min_dist = MIN(min_dist, _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(bottom_left, p1))); |
| michael@0 | 15 | min_dist = MIN(min_dist, _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(bottom_right, p1))); |
| michael@0 | 16 | |
| michael@0 | 17 | min_dist = MAX(-min_dist, 0); |
| michael@0 | 18 | |
| michael@0 | 19 | // Repeats after gradient start. |
| michael@0 | 20 | - int after_repeat = (int)ceil(max_dist / gradient_length); |
| michael@0 | 21 | + // It's possible for max_dist and min_dist to both be zero, in which case |
| michael@0 | 22 | + // we'll set num_stops to 0 and crash D2D. Let's just ensure after_repeat |
| michael@0 | 23 | + // is at least 1. |
| michael@0 | 24 | + int after_repeat = MAX((int)ceil(max_dist / gradient_length), 1); |
| michael@0 | 25 | int before_repeat = (int)ceil(min_dist / gradient_length); |
| michael@0 | 26 | num_stops *= (after_repeat + before_repeat); |
| michael@0 | 27 | |
| michael@0 | 28 | p2.x = p1.x + u.x * after_repeat * gradient_length; |
| michael@0 | 29 | p2.y = p1.y + u.y * after_repeat * gradient_length; |
| michael@0 | 30 | p1.x = p1.x - u.x * before_repeat * gradient_length; |
| michael@0 | 31 | p1.y = p1.y - u.y * before_repeat * gradient_length; |
| michael@0 | 32 |
