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

Revert "[ot-font] Minor simplification" 

This reverts commit 28c02b3768.

Old code was used in case of memory allocation failure (as shown
by fuzzers...)
This commit is contained in:
Behdad Esfahbod 2022-07-29 19:51:00 -06:00
parent f3aff45e04
commit a5d9012e94
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hb-ot-font.cc
View File

@ -188,10 +188,9 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
if (!use_cache) if (!use_cache)
{ {
assert (!varStore_cache);
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
{ {
*first_advance = font->em_scale_x (hmtx.get_advance_with_var_unscaled (*first_glyph, font, nullptr)); *first_advance = font->em_scale_x (hmtx.get_advance_with_var_unscaled (*first_glyph, font, varStore_cache));
first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride); first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride); first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
} }