gfx/cairo/max-font-size.patch@97036ab72558
gfx/cairo/max-font-size.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.
1 diff --git a/gfx/cairo/cairo/src/cairo-ft-font.c b/gfx/cairo/cairo/src/cairo-ft-font.c
2 --- a/gfx/cairo/cairo/src/cairo-ft-font.c
3 +++ b/gfx/cairo/cairo/src/cairo-ft-font.c
4 @@ -63,6 +63,10 @@
5 /* This is the max number of FT_face objects we keep open at once
6 */
7 #define MAX_OPEN_FACES 10
8 +
9 +/* This is the maximum font size we allow to be passed to FT_Set_Char_Size
10 + */
11 +#define MAX_FONT_SIZE 1000
13 /*
14 * The simple 2x2 matrix is converted into separate scale and shape
15 @@ -682,9 +686,11 @@ _cairo_ft_unscaled_font_set_scale (cairo
16 FT_Set_Transform(unscaled->face, &mat, NULL);
18 if ((unscaled->face->face_flags & FT_FACE_FLAG_SCALABLE) != 0) {
19 + double x_scale = MIN(sf.x_scale, MAX_FONT_SIZE);
20 + double y_scale = MIN(sf.y_scale, MAX_FONT_SIZE);
21 error = FT_Set_Char_Size (unscaled->face,
22 - sf.x_scale * 64.0 + .5,
23 - sf.y_scale * 64.0 + .5,
24 + x_scale * 64.0 + .5,
25 + y_scale * 64.0 + .5,
26 0, 0);
27 if (error)
28 return _cairo_error (CAIRO_STATUS_NO_MEMORY);
