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

[OTLayout] Towards correct FeatureParams handling

This commit is contained in:
Behdad Esfahbod 2012-12-17 13:55:36 -05:00
parent 87e43b7f2b
commit 9b54562d63
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-open-type-private.hh
View File

@ -704,7 +704,13 @@ struct GenericOffsetTo : OffsetType
return TRACE_RETURN (likely (obj.sanitize (c, user_data)) || neuter (c));
}
private:
inline bool try_set (hb_sanitize_context_t *c, const OffsetType &v) {
if (c->may_edit (this, this->static_size)) {
this->set (v);
return true;
}
return false;
}
/* Set the offset to Null */
inline bool neuter (hb_sanitize_context_t *c) {
if (c->may_edit (this, this->static_size)) {

25
src/hb-ot-layout-common-private.hh
View File

@ -423,8 +423,29 @@ struct Feature
inline bool sanitize (hb_sanitize_context_t *c,
const Record<Feature>::sanitize_closure_t *closure) {
TRACE_SANITIZE (this);
return TRACE_RETURN (c->check_struct (this) && lookupIndex.sanitize (c) &&
featureParams.sanitize (c, this));
if (unlikely (!(c->check_struct (this) && lookupIndex.sanitize (c))))
return TRACE_RETURN (false);
Offset orig_offset = featureParams;
if (likely (featureParams.sanitize (c, this)))
return TRACE_RETURN (true);
/* Some earlier versions of Adobe tools calculated the offset of the
* FeatureParams sutable from the beginning of the FeatureList table!
* Try that instead... */
if (closure && closure->list_base)
{
Offset new_offset;
new_offset.set (orig_offset - ((char *) this - (char *) closure->list_base));
/* Check that it did not overflow. */
if (new_offset != (orig_offset - ((char *) this - (char *) closure->list_base)))
return TRACE_RETURN (false);
return TRACE_RETURN (featureParams.try_set (c, new_offset) &&
featureParams.sanitize (c, this));
}
return TRACE_RETURN (false);
}
OffsetTo<FeatureParams>