1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/cairo/d2d-gradient-ensure-stops.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,32 @@
1.4 +# HG changeset patch
1.5 +# User Robert O'Callahan <robert@ocallahan.org>
1.6 +# Date 1348618772 -43200
1.7 +# Node ID 55ccbc8d52e69b020f2ba493e92ad2e214388df0
1.8 +# Parent e0d69219dd2b3b2826d186dc99c673b879409ea6
1.9 +Bug 792903. Prevent num_stops from being set to zero. r=bas
1.10 +
1.11 +diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp
1.12 +--- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp
1.13 ++++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp
1.14 +@@ -1641,17 +1641,20 @@ static RefPtr<ID2D1Brush>
1.15 + min_dist = MIN(_cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_left, p1)),
1.16 + _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_right, p1)));
1.17 + min_dist = MIN(min_dist, _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(bottom_left, p1)));
1.18 + min_dist = MIN(min_dist, _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(bottom_right, p1)));
1.19 +
1.20 + min_dist = MAX(-min_dist, 0);
1.21 +
1.22 + // Repeats after gradient start.
1.23 +- int after_repeat = (int)ceil(max_dist / gradient_length);
1.24 ++ // It's possible for max_dist and min_dist to both be zero, in which case
1.25 ++ // we'll set num_stops to 0 and crash D2D. Let's just ensure after_repeat
1.26 ++ // is at least 1.
1.27 ++ int after_repeat = MAX((int)ceil(max_dist / gradient_length), 1);
1.28 + int before_repeat = (int)ceil(min_dist / gradient_length);
1.29 + num_stops *= (after_repeat + before_repeat);
1.30 +
1.31 + p2.x = p1.x + u.x * after_repeat * gradient_length;
1.32 + p2.y = p1.y + u.y * after_repeat * gradient_length;
1.33 + p1.x = p1.x - u.x * before_repeat * gradient_length;
1.34 + p1.y = p1.y - u.y * before_repeat * gradient_length;
1.35 +
