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

Fix OffsetTo::sanitize() after reshuffling

This commit is contained in:
Behdad Esfahbod 2018-09-13 16:47:33 +02:00
parent 4c6b0fb5f6
commit 361fc26861
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,7 +274,8 @@ struct OffsetTo : Offset<OffsetType>
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (sanitize_shallow (c, base) && return_trace (sanitize_shallow (c, base) &&
(StructAtOffset<Type> (base, *this).sanitize (c) || (!*this ||
StructAtOffset<Type> (base, *this).sanitize (c) ||
neuter (c))); neuter (c)));
} }
template <typename T1> template <typename T1>
@ -282,7 +283,8 @@ struct OffsetTo : Offset<OffsetType>
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (sanitize_shallow (c, base) && return_trace (sanitize_shallow (c, base) &&
(StructAtOffset<Type> (base, *this).sanitize (c, d1) || (!*this ||
StructAtOffset<Type> (base, *this).sanitize (c, d1) ||
neuter (c))); neuter (c)));
} }
template <typename T1, typename T2> template <typename T1, typename T2>
@ -290,7 +292,8 @@ struct OffsetTo : Offset<OffsetType>
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (sanitize_shallow (c, base) && return_trace (sanitize_shallow (c, base) &&
(StructAtOffset<Type> (base, *this).sanitize (c, d1, d2) || (!*this ||
StructAtOffset<Type> (base, *this).sanitize (c, d1, d2) ||
neuter (c))); neuter (c)));
} }
template <typename T1, typename T2, typename T3> template <typename T1, typename T2, typename T3>
@ -298,7 +301,8 @@ struct OffsetTo : Offset<OffsetType>
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (sanitize_shallow (c, base) && return_trace (sanitize_shallow (c, base) &&
(StructAtOffset<Type> (base, *this).sanitize (c, d1, d2, d3) || (!*this ||
StructAtOffset<Type> (base, *this).sanitize (c, d1, d2, d3) ||
neuter (c))); neuter (c)));
} }