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

[aat] In ContextualSubtable, mark mark after substituting mark 

Fixes MORX-21.
This commit is contained in:
Behdad Esfahbod 2018-02-02 16:08:50 -05:00
parent fe5f9b1ae3
commit aed32589af
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hb-aat-layout-morx-table.hh
View File

@ -207,13 +207,7 @@ struct ContextualSubtable
{ {
hb_buffer_t *buffer = driver->buffer; hb_buffer_t *buffer = driver->buffer;
if (entry->flags & SetMark) if (entry->data.markIndex != 0xFFFF && mark < buffer->len)
{
mark = buffer->idx;
last_zero_before_mark = driver->last_zero;
}
if (entry->data.markIndex != 0xFFFF)
{ {
const Lookup<GlyphID> &lookup = subs[entry->data.markIndex]; const Lookup<GlyphID> &lookup = subs[entry->data.markIndex];
hb_glyph_info_t *info = buffer->info; hb_glyph_info_t *info = buffer->info;
@ -225,7 +219,7 @@ struct ContextualSubtable
ret = true; ret = true;
} }
} }
if (entry->data.currentIndex != 0xFFFF) if (entry->data.currentIndex != 0xFFFF && buffer->idx < buffer->len)
{ {
const Lookup<GlyphID> &lookup = subs[entry->data.currentIndex]; const Lookup<GlyphID> &lookup = subs[entry->data.currentIndex];
hb_glyph_info_t *info = buffer->info; hb_glyph_info_t *info = buffer->info;
@ -238,6 +232,12 @@ struct ContextualSubtable
} }
} }
if (entry->flags & SetMark)
{
mark = buffer->idx;
last_zero_before_mark = driver->last_zero;
}
return true; return true;
} }