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

OffsetTo::sanitize() reshuffling

This commit is contained in:
Behdad Esfahbod 2018-09-13 16:29:49 +02:00
parent bd75fd45cd
commit b482e5231c
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hb-open-type.hh
View File

@ -260,27 +260,39 @@ struct OffsetTo : Offset<OffsetType>
this->set (0); this->set (0);
} }
inline bool sanitize (hb_sanitize_context_t *c, const void *base) const inline bool sanitize_shallow (hb_sanitize_context_t *c, const void *base) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
if (unlikely (!c->check_struct (this))) return_trace (false); if (unlikely (!c->check_struct (this))) return_trace (false);
unsigned int offset = *this; unsigned int offset = *this;
if (unlikely (!offset)) return_trace (true); if (unlikely (!offset)) return_trace (true);
if (unlikely (!c->check_range (base, offset))) return_trace (false); if (unlikely (!c->check_range (base, offset))) return_trace (false);
const Type &obj = StructAtOffset<Type> (base, offset); return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
{
TRACE_SANITIZE (this);
if (unlikely (!sanitize_shallow (c, base))) return_trace (false);
const Type &obj = StructAtOffset<Type> (base, *this);
return_trace (likely (obj.sanitize (c)) || neuter (c)); return_trace (likely (obj.sanitize (c)) || neuter (c));
} }
template <typename T> template <typename T>
inline bool sanitize (hb_sanitize_context_t *c, const void *base, T user_data) const inline bool sanitize (hb_sanitize_context_t *c, const void *base, T user_data) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
if (unlikely (!c->check_struct (this))) return_trace (false); if (unlikely (!sanitize_shallow (c, base))) return_trace (false);
unsigned int offset = *this; const Type &obj = StructAtOffset<Type> (base, *this);
if (unlikely (!offset)) return_trace (true);
if (unlikely (!c->check_range (base, offset))) return_trace (false);
const Type &obj = StructAtOffset<Type> (base, offset);
return_trace (likely (obj.sanitize (c, user_data)) || neuter (c)); return_trace (likely (obj.sanitize (c, user_data)) || neuter (c));
} }
template <typename T1, typename T2>
inline bool sanitize (hb_sanitize_context_t *c, const void *base, T1 user_data1, T2 user_data2) const
{
TRACE_SANITIZE (this);
if (unlikely (!sanitize_shallow (c, base))) return_trace (false);
const Type &obj = StructAtOffset<Type> (base, *this);
return_trace (likely (obj.sanitize (c, user_data1, user_data2)) || neuter (c));
}
/* Set the offset to Null */ /* Set the offset to Null */
inline bool neuter (hb_sanitize_context_t *c) const { inline bool neuter (hb_sanitize_context_t *c) const {