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

[subset] inputSequence could be empty, change the sanity check

This commit is contained in:
Qunxin Liu 2021-11-18 16:53:36 -08:00 committed by Behdad Esfahbod
parent a75b96f7e5
commit e88fc41ef3
8 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hb-ot-layout-gsubgpos.hh
View File

@ -1642,9 +1642,8 @@ struct Rule
const hb_map_t *klass_map = nullptr) const const hb_map_t *klass_map = nullptr) const
{ {
TRACE_SUBSET (this); TRACE_SUBSET (this);
if (unlikely (!inputCount)) return_trace (false);
const hb_array_t<const HBUINT16> input = inputZ.as_array ((inputCount ? inputCount - 1 : 0)); const hb_array_t<const HBUINT16> input = inputZ.as_array (inputCount - 1);
if (!input.length) return_trace (false);
const hb_map_t *mapping = klass_map == nullptr ? c->plan->glyph_map : klass_map; const hb_map_t *mapping = klass_map == nullptr ? c->plan->glyph_map : klass_map;
if (!hb_all (input, mapping)) return_trace (false); if (!hb_all (input, mapping)) return_trace (false);

1
test/subset/data/Makefile.am
View File

@ -33,6 +33,7 @@ EXTRA_DIST += \
expected/layout.gdef \ expected/layout.gdef \
expected/layout.gdef.glyphset \ expected/layout.gdef.glyphset \
expected/layout.context \ expected/layout.context \
expected/layout.context_format2 \
expected/layout.gdef-varstore \ expected/layout.gdef-varstore \
expected/layout.gdef-attachlist \ expected/layout.gdef-attachlist \
expected/layout.notonastaliqurdu \ expected/layout.notonastaliqurdu \

1
test/subset/data/Makefile.sources
View File

@ -13,6 +13,7 @@ TESTS = \
tests/glyf_bug_3131.tests \ tests/glyf_bug_3131.tests \
tests/japanese.tests \ tests/japanese.tests \
tests/layout.context.tests \ tests/layout.context.tests \
tests/layout.context_format2.tests \
tests/layout.gdef-attachlist.tests \ tests/layout.gdef-attachlist.tests \
tests/layout.gdef-varstore.tests \ tests/layout.gdef-varstore.tests \
tests/layout.gdef.tests \ tests/layout.gdef.tests \

BIN
test/subset/data/expected/layout.context_format2/NotoSansNewa-Regular.layout-test-retain-gids.retain-all-codepoint.ttf Normal file
View File

Binary file not shown.

BIN
test/subset/data/expected/layout.context_format2/NotoSansNewa-Regular.layout-test.retain-all-codepoint.ttf Normal file
View File

Binary file not shown.

BIN
test/subset/data/fonts/NotoSansNewa-Regular.ttf Normal file
View File

Binary file not shown.

9
test/subset/data/tests/layout.context_format2.tests Normal file
View File

@ -0,0 +1,9 @@
FONTS:
NotoSansNewa-Regular.ttf
PROFILES:
layout-test.txt
layout-test-retain-gids.txt
SUBSETS:
*

1
test/subset/meson.build
View File

@ -25,6 +25,7 @@ tests = [
'layout.gdef.glyphset', 'layout.gdef.glyphset',
'layout.khmer', 'layout.khmer',
'layout.context', 'layout.context',
'layout.context_format2',
'layout.gdef-varstore', 'layout.gdef-varstore',
'layout.gdef-attachlist', 'layout.gdef-attachlist',
'layout.notonastaliqurdu', 'layout.notonastaliqurdu',