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

[paint] Limit the size of the graph we follow 

In addition to checking the depth, also count
the number of edges in the graph we've followed,
and give up after 1024.
This commit is contained in:
Matthias Clasen 2022-12-26 10:10:39 -05:00 committed by Behdad Esfahbod
parent 1eb4d002f2
commit ea2892c30e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-ot-color-colr-table.hh
View File

@ -45,6 +45,10 @@
#define HB_COLRV1_MAX_NESTING_LEVEL 128 #define HB_COLRV1_MAX_NESTING_LEVEL 128
#endif #endif
#ifndef HB_COLRV1_MAX_EDGE_COUNT
#define HB_COLRV1_MAX_EDGE_COUNT 1024
#endif
namespace OT { namespace OT {
struct hb_paint_context_t; struct hb_paint_context_t;
@ -75,6 +79,7 @@ public:
hb_color_t foreground; hb_color_t foreground;
VarStoreInstancer &instancer; VarStoreInstancer &instancer;
int depth_left = HB_COLRV1_MAX_NESTING_LEVEL; int depth_left = HB_COLRV1_MAX_NESTING_LEVEL;
int edge_count = HB_COLRV1_MAX_EDGE_COUNT;
hb_paint_context_t (const void *base_, hb_paint_context_t (const void *base_,
hb_paint_funcs_t *funcs_, hb_paint_funcs_t *funcs_,
@ -2151,7 +2156,8 @@ void
hb_paint_context_t::recurse (const Paint &paint) hb_paint_context_t::recurse (const Paint &paint)
{ {
depth_left--; depth_left--;
if (depth_left > 0) edge_count--;
if (depth_left > 0 && edge_count > 0)
paint.dispatch (this); paint.dispatch (this);
depth_left++; depth_left++;
} }