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

[CBDT] Fix more offsetting issues 

Fixes https://github.com/harfbuzz/harfbuzz/issues/960

dump-emoji still segfaults.  Needs debugging.
This commit is contained in:
Behdad Esfahbod 2018-10-14 21:32:09 -07:00
parent 6aee3bb87c
commit fc812faaa9
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/hb-ot-color-cbdt-table.hh
View File

@ -214,16 +214,14 @@ struct IndexSubtableRecord
return (this+offsetToSubtable).get_extents (extents); return (this+offsetToSubtable).get_extents (extents);
} }
bool get_image_data (unsigned int gid, bool get_image_data (unsigned int gid,
const void *base,
unsigned int *offset, unsigned int *offset,
unsigned int *length, unsigned int *length,
unsigned int *format) const unsigned int *format) const
{ {
if (gid < firstGlyphIndex || gid > lastGlyphIndex) if (gid < firstGlyphIndex || gid > lastGlyphIndex) return false;
{ return (base+offsetToSubtable).get_image_data (gid - firstGlyphIndex,
return false;
}
return (this+offsetToSubtable).get_image_data (gid - firstGlyphIndex,
offset, length, format); offset, length, format);
} }
@ -271,13 +269,15 @@ struct BitmapSizeTable
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (c->check_struct (this) && return_trace (c->check_struct (this) &&
indexSubtableArrayOffset.sanitize (c, base, numberOfIndexSubtables) && indexSubtableArrayOffset.sanitize (c, base, numberOfIndexSubtables) &&
c->check_range (&(base+indexSubtableArrayOffset), indexTablesSize) &&
horizontal.sanitize (c) && horizontal.sanitize (c) &&
vertical.sanitize (c)); vertical.sanitize (c));
} }
const IndexSubtableRecord *find_table (hb_codepoint_t glyph, const void *base) const const IndexSubtableRecord *find_table (hb_codepoint_t glyph,
const void *base,
const void **out_base) const
{ {
*out_base = &(base+indexSubtableArrayOffset);
return (base+indexSubtableArrayOffset).find_table (glyph, numberOfIndexSubtables); return (base+indexSubtableArrayOffset).find_table (glyph, numberOfIndexSubtables);
} }
@ -343,7 +343,8 @@ struct CBLC
protected: protected:
const IndexSubtableRecord *find_table (hb_codepoint_t glyph, const IndexSubtableRecord *find_table (hb_codepoint_t glyph,
unsigned int *x_ppem, unsigned int *y_ppem) const unsigned int *x_ppem, unsigned int *y_ppem,
const void **base) const
{ {
/* TODO: Make it possible to select strike. */ /* TODO: Make it possible to select strike. */
@ -356,7 +357,7 @@ struct CBLC
{ {
*x_ppem = sizeTables[i].ppemX; *x_ppem = sizeTables[i].ppemX;
*y_ppem = sizeTables[i].ppemY; *y_ppem = sizeTables[i].ppemY;
return sizeTables[i].find_table (glyph, this); return sizeTables[i].find_table (glyph, this, base);
} }
} }
@ -414,7 +415,8 @@ struct CBDT
if (!cblc) if (!cblc)
return false; // Not a color bitmap font. return false; // Not a color bitmap font.
const IndexSubtableRecord *subtable_record = this->cblc->find_table(glyph, &x_ppem, &y_ppem); const void *base;
const IndexSubtableRecord *subtable_record = this->cblc->find_table (glyph, &x_ppem, &y_ppem, &base);
if (!subtable_record || !x_ppem || !y_ppem) if (!subtable_record || !x_ppem || !y_ppem)
return false; return false;
@ -422,7 +424,7 @@ struct CBDT
return true; return true;
unsigned int image_offset = 0, image_length = 0, image_format = 0; unsigned int image_offset = 0, image_length = 0, image_format = 0;
if (!subtable_record->get_image_data (glyph, &image_offset, &image_length, &image_format)) if (!subtable_record->get_image_data (glyph, base, &image_offset, &image_length, &image_format))
return false; return false;
{ {
@ -473,7 +475,7 @@ struct CBDT
{ {
unsigned int image_offset = 0, image_length = 0, image_format = 0; unsigned int image_offset = 0, image_length = 0, image_format = 0;
if (!subtable_record.get_image_data (gid, if (!subtable_record.get_image_data (gid, &subtable_array,
&image_offset, &image_length, &image_format)) &image_offset, &image_length, &image_format))
continue; continue;