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

[var] Fix DeltaSetIndexMapFormat1 

Fixes https://github.com/harfbuzz/harfbuzz/issues/3692
This commit is contained in:
Behdad Esfahbod 2022-07-01 17:16:24 -06:00
parent 351cccdb75
commit 0a295fcde6
1 changed files with 12 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/hb-ot-var-common.hh
View File

@ -31,12 +31,13 @@
namespace OT { namespace OT {
struct DeltaSetIndexMapFormat0 template <typename MapCountT>
struct DeltaSetIndexMapFormat01
{ {
friend struct DeltaSetIndexMap; friend struct DeltaSetIndexMap;
private: private:
DeltaSetIndexMapFormat0* copy (hb_serialize_context_t *c) const DeltaSetIndexMapFormat01* copy (hb_serialize_context_t *c) const
{ {
TRACE_SERIALIZE (this); TRACE_SERIALIZE (this);
auto *out = c->start_embed (this); auto *out = c->start_embed (this);
@ -128,56 +129,12 @@ struct DeltaSetIndexMapFormat0
HBUINT8 format; /* Format identifier--format = 0 */ HBUINT8 format; /* Format identifier--format = 0 */
HBUINT8 entryFormat; /* A packed field that describes the compressed HBUINT8 entryFormat; /* A packed field that describes the compressed
* representation of delta-set indices. */ * representation of delta-set indices. */
HBUINT16 mapCount; /* The number of mapping entries. */ MapCountT mapCount; /* The number of mapping entries. */
UnsizedArrayOf<HBUINT8> UnsizedArrayOf<HBUINT8>
mapDataZ; /* The delta-set index mapping data. */ mapDataZ; /* The delta-set index mapping data. */
public: public:
DEFINE_SIZE_ARRAY (4, mapDataZ); DEFINE_SIZE_ARRAY (2+MapCountT::static_size, mapDataZ);
};
struct DeltaSetIndexMapFormat1
{
friend struct DeltaSetIndexMap;
private:
DeltaSetIndexMapFormat1* copy (hb_serialize_context_t *c) const
{
TRACE_SERIALIZE (this);
auto *out = c->start_embed (this);
if (unlikely (!out)) return_trace (nullptr);
unsigned total_size = min_size + mapCount * get_width ();
HBUINT8 *p = c->allocate_size<HBUINT8> (total_size);
if (unlikely (!p)) return_trace (nullptr);
memcpy (p, this, HBUINT8::static_size * total_size);
return_trace (out);
}
unsigned get_map_count () const { return mapCount; }
unsigned get_width () const { return ((entryFormat >> 4) & 3) + 1; }
unsigned get_inner_bit_count () const { return (entryFormat & 0xF) + 1; }
bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
return_trace (c->check_struct (this) &&
c->check_range (mapDataZ.arrayZ,
mapCount,
get_width ()));
}
protected:
HBUINT8 format; /* Format identifier--format = 1 */
HBUINT8 entryFormat; /* A packed field that describes the compressed
* representation of delta-set indices. */
HBUINT32 mapCount; /* The number of mapping entries. */
UnsizedArrayOf<HBUINT8>
mapDataZ; /* The delta-set index mapping data. */
public:
DEFINE_SIZE_ARRAY (6, mapDataZ);
}; };
struct DeltaSetIndexMap struct DeltaSetIndexMap
@ -186,8 +143,11 @@ struct DeltaSetIndexMap
bool serialize (hb_serialize_context_t *c, const T &plan) bool serialize (hb_serialize_context_t *c, const T &plan)
{ {
TRACE_SERIALIZE (this); TRACE_SERIALIZE (this);
unsigned length = plan.get_output_map ().length;
u.format = length <= 0xFFFF ? 0 : 1;
switch (u.format) { switch (u.format) {
case 0: return_trace (u.format0.serialize (c, plan)); case 0: return_trace (u.format0.serialize (c, plan));
case 1: return_trace (u.format1.serialize (c, plan));
default:return_trace (false); default:return_trace (false);
} }
} }
@ -196,6 +156,7 @@ struct DeltaSetIndexMap
{ {
switch (u.format) { switch (u.format) {
case 0: return (u.format0.map (v)); case 0: return (u.format0.map (v));
case 1: return (u.format1.map (v));
default:return v; default:return v;
} }
} }
@ -251,8 +212,8 @@ struct DeltaSetIndexMap
protected: protected:
union { union {
HBUINT8 format; /* Format identifier */ HBUINT8 format; /* Format identifier */
DeltaSetIndexMapFormat0 format0; DeltaSetIndexMapFormat01<HBUINT16> format0;
DeltaSetIndexMapFormat1 format1; DeltaSetIndexMapFormat01<HBUINT32> format1;
} u; } u;
public: public:
DEFINE_SIZE_UNION (1, format); DEFINE_SIZE_UNION (1, format);