walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ft-colr] Limit the size of the graph we follow 

This adds the same check that we already do in
the native implementation.
This commit is contained in:
Matthias Clasen 2022-12-26 13:47:35 -05:00 committed by Behdad Esfahbod
parent ea2892c30e
commit 5f5fa4b219
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hb-ft-colr.hh
View File

@ -35,6 +35,14 @@
#ifdef TT_SUPPORT_COLRV1 #ifdef TT_SUPPORT_COLRV1
#ifndef HB_COLRV1_MAX_NESTING_LEVEL
#define HB_COLRV1_MAX_NESTING_LEVEL 128
#endif
#ifndef HB_COLRV1_MAX_EDGE_COUNT
#define HB_COLRV1_MAX_EDGE_COUNT 1024
#endif
static hb_paint_composite_mode_t static hb_paint_composite_mode_t
_hb_ft_paint_composite_mode (FT_Composite_Mode mode) _hb_ft_paint_composite_mode (FT_Composite_Mode mode)
{ {
@ -94,7 +102,9 @@ struct hb_ft_paint_context_t
void recurse (FT_OpaquePaint paint) void recurse (FT_OpaquePaint paint)
{ {
if (depth_left <= 0) return; if (depth_left <= 0) return;
if (edge_count <= 0) return;
depth_left--; depth_left--;
edge_count--;
_hb_ft_paint (this, paint); _hb_ft_paint (this, paint);
depth_left++; depth_left++;
} }
@ -105,7 +115,8 @@ struct hb_ft_paint_context_t
void *data; void *data;
FT_Color *palette; FT_Color *palette;
hb_color_t foreground; hb_color_t foreground;
int depth_left = 128; int depth_left = HB_COLRV1_MAX_NESTING_LEVEL;
int edge_count = HB_COLRV1_MAX_EDGE_COUNT;
}; };
static unsigned static unsigned