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

refix PR #2087 subset PairPos1 

also added oss-fuzz 20211 data fixed by this
This commit is contained in:
ariza 2020-01-22 11:20:56 -08:00 committed by Garret Rieger
parent 7633b7695e
commit 1ab3924b31
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-ot-layout-gpos-table.hh
View File

@ -944,8 +944,8 @@ struct PairSet
unsigned count = len, num = 0; unsigned count = len, num = 0;
for (unsigned i = 0; i < count; i++) for (unsigned i = 0; i < count; i++)
{ {
if (!glyphset.has (record->secondGlyph)) continue; if (glyphset.has (record->secondGlyph)
if (record->serialize (c->serializer, &closure)) num++; && record->serialize (c->serializer, &closure)) num++;
record = &StructAtOffset<const PairValueRecord> (record, record_size); record = &StructAtOffset<const PairValueRecord> (record, record_size);
} }
@ -956,7 +956,6 @@ struct PairSet
struct sanitize_closure_t struct sanitize_closure_t
{ {
const void *base;
const ValueFormat *valueFormats; const ValueFormat *valueFormats;
unsigned int len1; /* valueFormats[0].get_len() */ unsigned int len1; /* valueFormats[0].get_len() */
unsigned int stride; /* 1 + len1 + len2 */ unsigned int stride; /* 1 + len1 + len2 */
@ -973,8 +972,8 @@ struct PairSet
unsigned int count = len; unsigned int count = len;
const PairValueRecord *record = &firstPairValueRecord; const PairValueRecord *record = &firstPairValueRecord;
return_trace (closure->valueFormats[0].sanitize_values_stride_unsafe (c, closure->base, &record->values[0], count, closure->stride) && return_trace (closure->valueFormats[0].sanitize_values_stride_unsafe (c, this, &record->values[0], count, closure->stride) &&
closure->valueFormats[1].sanitize_values_stride_unsafe (c, closure->base, &record->values[closure->len1], count, closure->stride)); closure->valueFormats[1].sanitize_values_stride_unsafe (c, this, &record->values[closure->len1], count, closure->stride));
} }
protected: protected:
@ -1078,7 +1077,6 @@ struct PairPosFormat1
unsigned int len2 = valueFormat[1].get_len (); unsigned int len2 = valueFormat[1].get_len ();
PairSet::sanitize_closure_t closure = PairSet::sanitize_closure_t closure =
{ {
&pairSet,
valueFormat, valueFormat,
len1, len1,
1 + len1 + len2 1 + len1 + len2

BIN
test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5206191479455744 Normal file
View File

Binary file not shown.