src/hb-ot-color-cbdt-table.hh | 39 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 21 deletions(-)
New commits:
commit fc812faaa96aa4e67814a92376b2da751d5a0aba
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Sun Oct 14 21:32:09 2018 -0700
[CBDT] Fix more offsetting issues
Fixes https://github.com/harfbuzz/harfbuzz/issues/960
dump-emoji still segfaults. Needs debugging.
diff --git a/src/hb-ot-color-cbdt-table.hh b/src/hb-ot-color-cbdt-table.hh
index 4c415932..30459684 100644
--- a/src/hb-ot-color-cbdt-table.hh
+++ b/src/hb-ot-color-cbdt-table.hh
@@ -214,16 +214,14 @@ struct IndexSubtableRecord
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 *length,
unsigned int *format) const
{
- if (gid < firstGlyphIndex || gid > lastGlyphIndex)
- {
- return false;
- }
- return (this+offsetToSubtable).get_image_data (gid - firstGlyphIndex,
+ if (gid < firstGlyphIndex || gid > lastGlyphIndex) return false;
+ return (base+offsetToSubtable).get_image_data (gid - firstGlyphIndex,
offset, length, format);
}
@@ -271,13 +269,15 @@ struct BitmapSizeTable
TRACE_SANITIZE (this);
return_trace (c->check_struct (this) &&
indexSubtableArrayOffset.sanitize (c, base,
numberOfIndexSubtables) &&
- c->check_range (&(base+indexSubtableArrayOffset),
indexTablesSize) &&
horizontal.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);
}
@@ -343,7 +343,8 @@ struct CBLC
protected:
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. */
@@ -356,7 +357,7 @@ struct CBLC
{
*x_ppem = sizeTables[i].ppemX;
*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)
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)
return false;
@@ -422,7 +424,7 @@ struct CBDT
return true;
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;
{
@@ -473,7 +475,7 @@ struct CBDT
{
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))
continue;
commit 6aee3bb87cee88525b745a640df294cb721245f6
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Sun Oct 14 21:08:42 2018 -0700
[CBDT] Fix offset handling
Fixes https://github.com/harfbuzz/harfbuzz/issues/960
diff --git a/src/hb-ot-color-cbdt-table.hh b/src/hb-ot-color-cbdt-table.hh
index 04847a74..4c415932 100644
--- a/src/hb-ot-color-cbdt-table.hh
+++ b/src/hb-ot-color-cbdt-table.hh
@@ -206,7 +206,7 @@ struct IndexSubtableRecord
TRACE_SANITIZE (this);
return_trace (c->check_struct (this) &&
firstGlyphIndex <= lastGlyphIndex &&
- offsetToSubtable.sanitize (c, this, lastGlyphIndex -
firstGlyphIndex + 1));
+ offsetToSubtable.sanitize (c, base, lastGlyphIndex -
firstGlyphIndex + 1));
}
inline bool get_extents (hb_glyph_extents_t *extents) const
commit da744c6b3e79b778f414ec9f4d9070d06ec2a706
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Sun Oct 14 20:49:21 2018 -0700
[CBDT] More UnsizedArrayOf cleanup
diff --git a/src/hb-ot-color-cbdt-table.hh b/src/hb-ot-color-cbdt-table.hh
index 01e0f9da..04847a74 100644
--- a/src/hb-ot-color-cbdt-table.hh
+++ b/src/hb-ot-color-cbdt-table.hh
@@ -128,7 +128,7 @@ struct IndexSubtableFormat1Or3
{
TRACE_SANITIZE (this);
return_trace (c->check_struct (this) &&
- c->check_array (offsetArrayZ.arrayZ, glyph_count + 1));
+ offsetArrayZ.sanitize (c, glyph_count + 1));
}
bool get_image_data (unsigned int idx,
commit 2995b4465bce52b30de2cb6ba24cc80d8602413d
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Sun Oct 14 20:37:57 2018 -0700
[CBDT] Simplify sanitize
diff --git a/src/hb-ot-color-cbdt-table.hh b/src/hb-ot-color-cbdt-table.hh
index 561c5990..01e0f9da 100644
--- a/src/hb-ot-color-cbdt-table.hh
+++ b/src/hb-ot-color-cbdt-table.hh
@@ -241,12 +241,7 @@ struct IndexSubtableArray
inline bool sanitize (hb_sanitize_context_t *c, unsigned int count) const
{
TRACE_SANITIZE (this);
- if (unlikely (!c->check_array (indexSubtablesZ.arrayZ, count)))
- return_trace (false);
- for (unsigned int i = 0; i < count; i++)
- if (unlikely (!indexSubtablesZ[i].sanitize (c, this)))
- return_trace (false);
- return_trace (true);
+ return_trace (indexSubtablesZ.sanitize (c, count, this));
}
public:
_______________________________________________
HarfBuzz mailing list
HarfBuzz@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/harfbuzz
