X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fhb-open-type-private.hh;h=ea1d371ae5aee9f4df228bdcef8b47dffe721ecc;hb=8f08c3275040870a645ef034a38d30c05c619f21;hp=258a46212f26802ba3a3dca9d3e542f1e600e383;hpb=66d6eb30eb0b8d61e00f86ea0c7829abaddb52fa;p=framework%2Fuifw%2Fharfbuzz.git diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index 258a462..ea1d371 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh @@ -24,31 +24,21 @@ * Red Hat Author(s): Behdad Esfahbod */ -#ifndef HB_OPEN_TYPES_PRIVATE_HH -#define HB_OPEN_TYPES_PRIVATE_HH +#ifndef HB_OPEN_TYPE_PRIVATE_HH +#define HB_OPEN_TYPE_PRIVATE_HH #include "hb-private.h" #include "hb-blob.h" - -/* Table/script/language-system/feature/... not found */ -#define NO_INDEX ((unsigned int) 0xFFFF) - +HB_BEGIN_DECLS +HB_END_DECLS /* * Casts */ -/* Cast to "const char *" and "char *" */ -template -inline const char * CharP (const Type* X) -{ return reinterpret_cast(X); } -template -inline char * CharP (Type* X) -{ return reinterpret_cast(X); } - /* Cast to struct T, reference to reference */ template inline const Type& CastR(const TObject &X) @@ -65,210 +55,225 @@ template inline Type* CastP(TObject *X) { return reinterpret_cast (X); } -/* StructAtOffset(X,Ofs) returns the struct T& that is placed at memory - * location of X plus Ofs bytes. */ -template -inline const Type& StructAtOffset(const TObject &X, unsigned int offset) -{ return * reinterpret_cast (CharP(&X) + offset); } -template -inline Type& StructAtOffset(TObject &X, unsigned int offset) -{ return * reinterpret_cast (CharP(&X) + offset); } +/* StructAtOffset(P,Ofs) returns the struct T& that is placed at memory + * location pointed to by P plus Ofs bytes. */ +template +inline const Type& StructAtOffset(const void *P, unsigned int offset) +{ return * reinterpret_cast ((const char *) P + offset); } +template +inline Type& StructAtOffset(void *P, unsigned int offset) +{ return * reinterpret_cast ((char *) P + offset); } /* StructAfter(X) returns the struct T& that is placed after X. * Works with X of variable size also. X must implement get_size() */ template inline const Type& StructAfter(const TObject &X) -{ return StructAtOffset(X, X.get_size()); } +{ return StructAtOffset(&X, X.get_size()); } template inline Type& StructAfter(TObject &X) -{ return StructAtOffset(X, X.get_size()); } +{ return StructAtOffset(&X, X.get_size()); } /* - * Class features + * Size checking */ +/* Check _assertion in a method environment */ +#define _DEFINE_SIZE_ASSERTION(_assertion) \ + inline void _size_assertion (void) const \ + { ASSERT_STATIC (_assertion); } +/* Check that _code compiles in a method environment */ +#define _DEFINE_COMPILES_ASSERTION(_code) \ + inline void _compiles_assertion (void) const \ + { _code; } + + +#define DEFINE_SIZE_STATIC(size) \ + _DEFINE_SIZE_ASSERTION (sizeof (*this) == (size)); \ + static const unsigned int static_size = (size); \ + static const unsigned int min_size = (size) + +/* Size signifying variable-sized array */ +#define VAR 1 + +#define DEFINE_SIZE_UNION(size, _member) \ + _DEFINE_SIZE_ASSERTION (this->u._member.static_size == (size)); \ + static const unsigned int min_size = (size) + +#define DEFINE_SIZE_MIN(size) \ + _DEFINE_SIZE_ASSERTION (sizeof (*this) >= (size)); \ + static const unsigned int min_size = (size) + +#define DEFINE_SIZE_ARRAY(size, array) \ + _DEFINE_SIZE_ASSERTION (sizeof (*this) == (size) + sizeof (array[0])); \ + _DEFINE_COMPILES_ASSERTION ((void) array[0].static_size) \ + static const unsigned int min_size = (size) + +#define DEFINE_SIZE_ARRAY2(size, array1, array2) \ + _DEFINE_SIZE_ASSERTION (sizeof (*this) == (size) + sizeof (this->array1[0]) + sizeof (this->array2[0])); \ + _DEFINE_COMPILES_ASSERTION ((void) array1[0].static_size; (void) array2[0].static_size) \ + static const unsigned int min_size = (size) + -/* Null objects */ + +/* + * Null objects + */ /* Global nul-content Null pool. Enlarge as necessary. */ -static const void *_NullPool[32 / sizeof (void *)]; +static const void *_NullPool[64 / sizeof (void *)]; -/* Generic template for nul-content sizeof-sized Null objects. */ +/* Generic nul-content Null objects. */ template -static inline const Type& Null () { - ASSERT_STATIC (sizeof (Type) <= sizeof (_NullPool)); +static inline const Type& Null (void) { + ASSERT_STATIC (Type::min_size <= sizeof (_NullPool)); return *CastP (_NullPool); } /* Specializaiton for arbitrary-content arbitrary-sized Null objects. */ -#define DEFINE_NULL_DATA(Type, size, data) \ -static const char _Null##Type[size + 1] = data; /* +1 is for nul-termination in data */ \ +#define DEFINE_NULL_DATA(Type, data) \ +static const char _Null##Type[Type::min_size + 1] = data; /* +1 is for nul-termination in data */ \ template <> \ -inline const Type& Null () { \ +inline const Type& Null (void) { \ return *CastP (_Null##Type); \ } /* The following line really exists such that we end in a place needing semicolon */ \ -ASSERT_STATIC (sizeof (Type) + 1 <= sizeof (_Null##Type)) +ASSERT_STATIC (Type::min_size + 1 <= sizeof (_Null##Type)) /* Accessor macro. */ #define Null(Type) Null() - /* - * Sanitize + * Trace */ -#ifndef HB_DEBUG_SANITIZE -#define HB_DEBUG_SANITIZE HB_DEBUG -#endif - -#if HB_DEBUG_SANITIZE -#include -#define TRACE_SANITIZE_ARG_DEF , unsigned int sanitize_depth HB_GNUC_UNUSED -#define TRACE_SANITIZE_ARG , sanitize_depth + 1 -#define TRACE_SANITIZE_ARG_INIT , 1 -#define TRACE_SANITIZE() \ - HB_STMT_START { \ - if (sanitize_depth < HB_DEBUG_SANITIZE) \ - fprintf (stderr, "SANITIZE(%p) %-*d-> %s\n", \ - (CharP(this) == CharP(&NullPool)) ? 0 : this, \ - sanitize_depth, sanitize_depth, \ - __PRETTY_FUNCTION__); \ - } HB_STMT_END -#else -#define TRACE_SANITIZE_ARG_DEF -#define TRACE_SANITIZE_ARG -#define TRACE_SANITIZE_ARG_INIT -#define TRACE_SANITIZE() HB_STMT_START {} HB_STMT_END -#endif -#define SANITIZE_ARG_DEF \ - hb_sanitize_context_t *context TRACE_SANITIZE_ARG_DEF -#define SANITIZE_ARG \ - context TRACE_SANITIZE_ARG -#define SANITIZE_ARG_INIT \ - &context TRACE_SANITIZE_ARG_INIT +template +struct hb_trace_t { + explicit hb_trace_t (unsigned int *pdepth, const char *what, const char *function, const void *obj) : pdepth(pdepth) { + if (*pdepth < max_depth) + fprintf (stderr, "%s(%p) %-*d-> %s\n", what, obj, *pdepth, *pdepth, function); + if (max_depth) ++*pdepth; + } + ~hb_trace_t (void) { if (max_depth) --*pdepth; } -typedef struct _hb_sanitize_context_t hb_sanitize_context_t; -struct _hb_sanitize_context_t -{ - const char *start, *end; - hb_bool_t writable; - unsigned int edit_count; + private: + unsigned int *pdepth; +}; +template <> /* Optimize when tracing is disabled */ +struct hb_trace_t<0> { + explicit hb_trace_t (unsigned int *pdepth HB_UNUSED, const char *what HB_UNUSED, const char *function HB_UNUSED, const void *obj HB_UNUSED) {} }; -static HB_GNUC_UNUSED void -_hb_sanitize_init (hb_sanitize_context_t *context, - hb_blob_t *blob) -{ - context->start = hb_blob_lock (blob); - context->end = context->start + hb_blob_get_length (blob); - context->writable = hb_blob_is_writable (blob); - context->edit_count = 0; - -#if HB_DEBUG_SANITIZE - fprintf (stderr, "sanitize %p init [%p..%p] (%u bytes)\n", - context->blob, context->start, context->end, context->end - context->start); -#endif -} -static HB_GNUC_UNUSED void -_hb_sanitize_fini (hb_sanitize_context_t *context HB_GNUC_UNUSED, - hb_blob_t *blob) -{ -#if HB_DEBUG_SANITIZE - fprintf (stderr, "sanitize %p fini [%p..%p] %u edit requests\n", - blob, context->start, context->end, context->edit_count); -#endif - hb_blob_unlock (blob); -} +/* + * Sanitize + */ -static HB_GNUC_UNUSED inline bool -_hb_sanitize_check (SANITIZE_ARG_DEF, - const char *base, - unsigned int len) -{ - bool ret = context->start <= base && - base <= context->end && - (unsigned int) (context->end - base) >= len; - -#if HB_DEBUG_SANITIZE - if (sanitize_depth < HB_DEBUG_SANITIZE) \ - fprintf (stderr, "SANITIZE(%p) %-*d-> check [%p..%p] (%d bytes) in [%p..%p] -> %s\n", \ - base, - sanitize_depth, sanitize_depth, - base, base+len, len, - context->start, context->end, - ret ? "pass" : "FAIL"); +#ifndef HB_DEBUG_SANITIZE +#define HB_DEBUG_SANITIZE HB_DEBUG+0 #endif - return ret; -} -static HB_GNUC_UNUSED inline bool -_hb_sanitize_array (SANITIZE_ARG_DEF, - const char *base, - unsigned int record_size, - unsigned int len) -{ - bool overflows = len >= ((unsigned int) -1) / record_size; - -#if HB_DEBUG_SANITIZE - if (sanitize_depth < HB_DEBUG_SANITIZE) \ - fprintf (stderr, "SANITIZE(%p) %-*d-> array [%p..%p] (%d*%d=%ld bytes) in [%p..%p] -> %s\n", \ - base, - sanitize_depth, sanitize_depth, - base, base + (record_size * len), record_size, len, (unsigned long) record_size * len, - context->start, context->end, - !overflows ? "does not overflow" : "OVERFLOWS FAIL"); -#endif - return HB_LIKELY (!overflows) && _hb_sanitize_check (SANITIZE_ARG, base, record_size * len); -} +#define TRACE_SANITIZE() \ + hb_trace_t trace (&c->debug_depth, "SANITIZE", HB_FUNC, this); \ -static HB_GNUC_UNUSED inline bool -_hb_sanitize_edit (SANITIZE_ARG_DEF, - const char *base HB_GNUC_UNUSED, - unsigned int len HB_GNUC_UNUSED) -{ - context->edit_count++; - -#if HB_DEBUG_SANITIZE - fprintf (stderr, "SANITIZE(%p) %-*d-> edit(%u) [%p..%p] (%d bytes) in [%p..%p] -> %s\n", \ - base, - sanitize_depth, sanitize_depth, - context->edit_count, - base, base+len, len, - context->start, context->end, - context->writable ? "granted" : "REJECTED"); -#endif - return context->writable; -} +struct hb_sanitize_context_t +{ + inline void init (hb_blob_t *blob) + { + this->blob = hb_blob_reference (blob); + this->start = hb_blob_lock (blob); + this->end = this->start + hb_blob_get_length (blob); + this->writable = hb_blob_is_writable (blob); + this->edit_count = 0; + this->debug_depth = 0; + + if (HB_DEBUG_SANITIZE) + fprintf (stderr, "sanitize %p init [%p..%p] (%lu bytes)\n", + this->blob, this->start, this->end, + (unsigned long) (this->end - this->start)); + } -#define SANITIZE(X) HB_LIKELY ((X).sanitize (SANITIZE_ARG)) -#define SANITIZE2(X,Y) (SANITIZE (X) && SANITIZE (Y)) + inline void finish (void) + { + if (HB_DEBUG_SANITIZE) + fprintf (stderr, "sanitize %p fini [%p..%p] %u edit requests\n", + this->blob, this->start, this->end, this->edit_count); + + hb_blob_unlock (this->blob); + hb_blob_destroy (this->blob); + this->blob = NULL; + this->start = this->end = NULL; + } -#define SANITIZE_THIS(X) HB_LIKELY ((X).sanitize (SANITIZE_ARG, CharP(this))) -#define SANITIZE_THIS2(X,Y) (SANITIZE_THIS (X) && SANITIZE_THIS (Y)) -#define SANITIZE_THIS3(X,Y,Z) (SANITIZE_THIS (X) && SANITIZE_THIS (Y) && SANITIZE_THIS(Z)) + inline bool check_range (const void *base, unsigned int len) const + { + const char *p = (const char *) base; + bool ret = this->start <= p && + p <= this->end && + (unsigned int) (this->end - p) >= len; + + if (HB_DEBUG_SANITIZE && (int) this->debug_depth < (int) HB_DEBUG_SANITIZE) \ + fprintf (stderr, "SANITIZE(%p) %-*d-> range [%p..%p] (%d bytes) in [%p..%p] -> %s\n", \ + p, + this->debug_depth, this->debug_depth, + p, p + len, len, + this->start, this->end, + ret ? "pass" : "FAIL"); + + return likely (ret); + } -#define SANITIZE_BASE(X,B) HB_LIKELY ((X).sanitize (SANITIZE_ARG, B)) -#define SANITIZE_BASE2(X,Y,B) (SANITIZE_BASE (X,B) && SANITIZE_BASE (Y,B)) + inline bool check_array (const void *base, unsigned int record_size, unsigned int len) const + { + const char *p = (const char *) base; + bool overflows = record_size > 0 && len >= ((unsigned int) -1) / record_size; + + if (HB_DEBUG_SANITIZE && (int) this->debug_depth < (int) HB_DEBUG_SANITIZE) + fprintf (stderr, "SANITIZE(%p) %-*d-> array [%p..%p] (%d*%d=%ld bytes) in [%p..%p] -> %s\n", \ + p, + this->debug_depth, this->debug_depth, + p, p + (record_size * len), record_size, len, (unsigned long) record_size * len, + this->start, this->end, + !overflows ? "does not overflow" : "OVERFLOWS FAIL"); + + return likely (!overflows && this->check_range (base, record_size * len)); + } -#define SANITIZE_SELF() SANITIZE_OBJ (*this) -#define SANITIZE_OBJ(X) SANITIZE_MEM(&(X), sizeof (X)) + template + inline bool check_struct (const Type *obj) const + { + return likely (this->check_range (obj, obj->min_size)); + } -#define SANITIZE_MEM(B,L) HB_LIKELY (_hb_sanitize_check (SANITIZE_ARG, CharP(B), (L))) + inline bool can_edit (const void *base HB_UNUSED, unsigned int len HB_UNUSED) + { + const char *p = (const char *) base; + this->edit_count++; + + if (HB_DEBUG_SANITIZE && (int) this->debug_depth < (int) HB_DEBUG_SANITIZE) + fprintf (stderr, "SANITIZE(%p) %-*d-> edit(%u) [%p..%p] (%d bytes) in [%p..%p] -> %s\n", \ + p, + this->debug_depth, this->debug_depth, + this->edit_count, + p, p + len, len, + this->start, this->end, + this->writable ? "granted" : "REJECTED"); + + return this->writable; + } -#define SANITIZE_ARRAY(A,S,L) HB_LIKELY (_hb_sanitize_array (SANITIZE_ARG, CharP(A), S, L)) + unsigned int debug_depth; + const char *start, *end; + bool writable; + unsigned int edit_count; + hb_blob_t *blob; +}; -#define NEUTER(Obj, Val) \ - (SANITIZE_OBJ (Obj) && \ - _hb_sanitize_edit (SANITIZE_ARG, CharP(&(Obj)), (Obj).get_size ()) && \ - ((Obj).set (Val), true)) /* Template to sanitize an object. */ @@ -276,55 +281,58 @@ template struct Sanitizer { static hb_blob_t *sanitize (hb_blob_t *blob) { - hb_sanitize_context_t context; + hb_sanitize_context_t c[1] = {{0}}; bool sane; /* TODO is_sane() stuff */ + if (!blob) + return hb_blob_create_empty (); + retry: -#if HB_DEBUG_SANITIZE - fprintf (stderr, "Sanitizer %p start %s\n", blob, __PRETTY_FUNCTION__); -#endif + if (HB_DEBUG_SANITIZE) + fprintf (stderr, "Sanitizer %p start %s\n", blob, HB_FUNC); - _hb_sanitize_init (&context, blob); + c->init (blob); - /* Note: We drop const here */ - Type *t = CastP ((void *) context.start); + if (unlikely (!c->start)) { + c->finish (); + return blob; + } - sane = t->sanitize (SANITIZE_ARG_INIT); + Type *t = CastP (const_cast (c->start)); + + sane = t->sanitize (c); if (sane) { - if (context.edit_count) { -#if HB_DEBUG_SANITIZE - fprintf (stderr, "Sanitizer %p passed first round with %d edits; doing a second round %s\n", - blob, context.edit_count, __PRETTY_FUNCTION__); -#endif + if (c->edit_count) { + if (HB_DEBUG_SANITIZE) + fprintf (stderr, "Sanitizer %p passed first round with %d edits; doing a second round %s\n", + blob, c->edit_count, HB_FUNC); + /* sanitize again to ensure no toe-stepping */ - context.edit_count = 0; - sane = t->sanitize (SANITIZE_ARG_INIT); - if (context.edit_count) { -#if HB_DEBUG_SANITIZE - fprintf (stderr, "Sanitizer %p requested %d edits in second round; FAILLING %s\n", - blob, context.edit_count, __PRETTY_FUNCTION__); -#endif + c->edit_count = 0; + sane = t->sanitize (c); + if (c->edit_count) { + if (HB_DEBUG_SANITIZE) + fprintf (stderr, "Sanitizer %p requested %d edits in second round; FAILLING %s\n", + blob, c->edit_count, HB_FUNC); sane = false; } } - _hb_sanitize_fini (&context, blob); + c->finish (); } else { - unsigned int edit_count = context.edit_count; - _hb_sanitize_fini (&context, blob); + unsigned int edit_count = c->edit_count; + c->finish (); if (edit_count && !hb_blob_is_writable (blob) && hb_blob_try_writable (blob)) { /* ok, we made it writable by relocating. try again */ -#if HB_DEBUG_SANITIZE - fprintf (stderr, "Sanitizer %p retry %s\n", blob, __PRETTY_FUNCTION__); -#endif + if (HB_DEBUG_SANITIZE) + fprintf (stderr, "Sanitizer %p retry %s\n", blob, HB_FUNC); goto retry; } } -#if HB_DEBUG_SANITIZE - fprintf (stderr, "Sanitizer %p %s %s\n", blob, sane ? "passed" : "FAILED", __PRETTY_FUNCTION__); -#endif + if (HB_DEBUG_SANITIZE) + fprintf (stderr, "Sanitizer %p %s %s\n", blob, sane ? "passed" : "FAILED", HB_FUNC); if (sane) return blob; else { @@ -332,9 +340,16 @@ struct Sanitizer return hb_blob_create_empty (); } } + + static const Type* lock_instance (hb_blob_t *blob) { + const char *base = hb_blob_lock (blob); + return unlikely (!base) ? &Null(Type) : CastP (base); + } }; + + /* * * The OpenType Font File: Data Types @@ -357,8 +372,8 @@ template class BEInt { public: - inline class BEInt& operator = (Type i) { hb_be_uint16_put (v,i); return *this; } - inline operator Type () const { return hb_be_uint16_get (v); } + inline void set (Type i) { hb_be_uint16_put (v,i); } + inline operator Type (void) const { return hb_be_uint16_get (v); } inline bool operator == (const BEInt& o) const { return hb_be_uint16_cmp (v, o.v); } inline bool operator != (const BEInt& o) const { return !(*this == o); } private: uint8_t v[2]; @@ -367,8 +382,8 @@ template class BEInt { public: - inline class BEInt& operator = (Type i) { hb_be_uint32_put (v,i); return *this; } - inline operator Type () const { return hb_be_uint32_get (v); } + inline void set (Type i) { hb_be_uint32_put (v,i); } + inline operator Type (void) const { return hb_be_uint32_get (v); } inline bool operator == (const BEInt& o) const { return hb_be_uint32_cmp (v, o.v); } inline bool operator != (const BEInt& o) const { return !(*this == o); } private: uint8_t v[4]; @@ -378,16 +393,19 @@ class BEInt template struct IntType { - static inline unsigned int get_size () { return sizeof (Type); } - inline void set (Type i) { v = i; } + inline void set (Type i) { v.set (i); } inline operator Type(void) const { return v; } inline bool operator == (const IntType &o) const { return v == o.v; } inline bool operator != (const IntType &o) const { return v != o.v; } - inline bool sanitize (SANITIZE_ARG_DEF) { + inline int cmp (Type a) const { Type b = v; return a < b ? -1 : a == b ? 0 : +1; } + inline bool sanitize (hb_sanitize_context_t *c) { TRACE_SANITIZE (); - return SANITIZE_SELF (); + return likely (c->check_struct (this)); } - private: BEInt v; + protected: + BEInt v; + public: + DEFINE_SIZE_STATIC (sizeof (Type)); }; typedef IntType USHORT; /* 16-bit unsigned integer. */ @@ -395,25 +413,42 @@ typedef IntType SHORT; /* 16-bit signed integer. */ typedef IntType ULONG; /* 32-bit unsigned integer. */ typedef IntType LONG; /* 32-bit signed integer. */ -ASSERT_SIZE (USHORT, 2); -ASSERT_SIZE (SHORT, 2); -ASSERT_SIZE (ULONG, 4); -ASSERT_SIZE (LONG, 4); +/* Date represented in number of seconds since 12:00 midnight, January 1, + * 1904. The value is represented as a signed 64-bit integer. */ +struct LONGDATETIME +{ + inline bool sanitize (hb_sanitize_context_t *c) { + TRACE_SANITIZE (); + return likely (c->check_struct (this)); + } + private: + LONG major; + ULONG minor; + public: + DEFINE_SIZE_STATIC (8); +}; /* Array of four uint8s (length = 32 bits) used to identify a script, language * system, feature, or baseline */ struct Tag : ULONG { /* What the char* converters return is NOT nul-terminated. Print using "%.4s" */ - inline operator const char* (void) const { return CharP(this); } - inline operator char* (void) { return CharP(this); } + inline operator const char* (void) const { return reinterpret_cast (&this->v); } + inline operator char* (void) { return reinterpret_cast (&this->v); } + public: + DEFINE_SIZE_STATIC (4); }; -ASSERT_SIZE (Tag, 4); -DEFINE_NULL_DATA (Tag, 4, " "); +DEFINE_NULL_DATA (Tag, " "); /* Glyph index number, same as uint16 (length = 16 bits) */ typedef USHORT GlyphID; +/* Script/language-system/feature index */ +struct Index : USHORT { + static const unsigned int NOT_FOUND_INDEX = 0xFFFF; +}; +DEFINE_NULL_DATA (Index, "\xff\xff"); + /* Offset to a table, same as uint16 (length = 16 bits), Null offset = 0x0000 */ typedef USHORT Offset; @@ -427,14 +462,15 @@ struct CheckSum : ULONG static uint32_t CalcTableChecksum (ULONG *Table, uint32_t Length) { uint32_t Sum = 0L; - ULONG *EndPtr = Table+((Length+3) & ~3) / ULONG::get_size (); + ULONG *EndPtr = Table+((Length+3) & ~3) / ULONG::static_size; while (Table < EndPtr) Sum += *Table++; return Sum; } + public: + DEFINE_SIZE_STATIC (4); }; -ASSERT_SIZE (CheckSum, 4); /* @@ -445,21 +481,22 @@ struct FixedVersion { inline operator uint32_t (void) const { return (major << 16) + minor; } - inline bool sanitize (SANITIZE_ARG_DEF) { + inline bool sanitize (hb_sanitize_context_t *c) { TRACE_SANITIZE (); - return SANITIZE_SELF (); + return c->check_struct (this); } USHORT major; USHORT minor; + public: + DEFINE_SIZE_STATIC (4); }; -ASSERT_SIZE (FixedVersion, 4); /* * Template subclasses of Offset and LongOffset that do the dereferencing. - * Use: (this+memberName) + * Use: (base+offset) */ template @@ -468,30 +505,36 @@ struct GenericOffsetTo : OffsetType inline const Type& operator () (const void *base) const { unsigned int offset = *this; - if (HB_UNLIKELY (!offset)) return Null(Type); - return StructAtOffset (*CharP(base), offset); + if (unlikely (!offset)) return Null(Type); + return StructAtOffset (base, offset); } - inline bool sanitize (SANITIZE_ARG_DEF, void *base) { + inline bool sanitize (hb_sanitize_context_t *c, void *base) { TRACE_SANITIZE (); - if (!SANITIZE_SELF ()) return false; + if (unlikely (!c->check_struct (this))) return false; unsigned int offset = *this; - if (HB_UNLIKELY (!offset)) return true; - return SANITIZE (StructAtOffset (*CharP(base), offset)) || NEUTER (*this, 0); + if (unlikely (!offset)) return true; + Type &obj = StructAtOffset (base, offset); + return likely (obj.sanitize (c)) || neuter (c); } - inline bool sanitize (SANITIZE_ARG_DEF, void *base, void *base2) { + template + inline bool sanitize (hb_sanitize_context_t *c, void *base, T user_data) { TRACE_SANITIZE (); - if (!SANITIZE_SELF ()) return false; + if (unlikely (!c->check_struct (this))) return false; unsigned int offset = *this; - if (HB_UNLIKELY (!offset)) return true; - return SANITIZE_BASE (StructAtOffset (*CharP(base), offset), base2) || NEUTER (*this, 0); + if (unlikely (!offset)) return true; + Type &obj = StructAtOffset (base, offset); + return likely (obj.sanitize (c, user_data)) || neuter (c); } - inline bool sanitize (SANITIZE_ARG_DEF, void *base, unsigned int user_data) { - TRACE_SANITIZE (); - if (!SANITIZE_SELF ()) return false; - unsigned int offset = *this; - if (HB_UNLIKELY (!offset)) return true; - return SANITIZE_BASE (StructAtOffset (*CharP(base), offset), user_data) || NEUTER (*this, 0); + + private: + /* Set the offset to Null */ + inline bool neuter (hb_sanitize_context_t *c) { + if (c->can_edit (this, this->static_size)) { + this->set (0); /* 0 is Null offset */ + return true; + } + return false; } }; template @@ -511,37 +554,29 @@ struct LongOffsetTo : GenericOffsetTo {}; template struct GenericArrayOf { - const Type *array(void) const { return &StructAfter (len); } - Type *array(void) { return &StructAfter (len); } - const Type *sub_array (unsigned int start_offset, unsigned int *pcount /* IN/OUT */) const { unsigned int count = len; - if (HB_UNLIKELY (start_offset > count)) + if (unlikely (start_offset > count)) count = 0; else count -= start_offset; count = MIN (count, *pcount); *pcount = count; - return array() + start_offset; + return array + start_offset; } inline const Type& operator [] (unsigned int i) const { - if (HB_UNLIKELY (i >= len)) return Null(Type); - return array()[i]; + if (unlikely (i >= len)) return Null(Type); + return array[i]; } - inline unsigned int get_size () const - { return len.get_size () + len * Type::get_size (); } + inline unsigned int get_size (void) const + { return len.static_size + len * Type::static_size; } - inline bool sanitize_shallow (SANITIZE_ARG_DEF) { + inline bool sanitize (hb_sanitize_context_t *c) { TRACE_SANITIZE (); - return SANITIZE_SELF() && SANITIZE_ARRAY (this, Type::get_size (), len); - } - - inline bool sanitize (SANITIZE_ARG_DEF) { - TRACE_SANITIZE (); - if (!HB_LIKELY (sanitize_shallow (SANITIZE_ARG))) return false; + if (unlikely (!sanitize_shallow (c))) return false; /* Note: for structs that do not reference other structs, * we do not need to call their sanitize() as we already did * a bound check on the aggregate array size, hence the return. @@ -552,40 +587,42 @@ struct GenericArrayOf * other structs. */ unsigned int count = len; for (unsigned int i = 0; i < count; i++) - if (!SANITIZE (array()[i])) + if (array[i].sanitize (c)) return false; return true; } - inline bool sanitize (SANITIZE_ARG_DEF, void *base) { + inline bool sanitize (hb_sanitize_context_t *c, void *base) { TRACE_SANITIZE (); - if (!HB_LIKELY (sanitize_shallow (SANITIZE_ARG))) return false; + if (unlikely (!sanitize_shallow (c))) return false; unsigned int count = len; for (unsigned int i = 0; i < count; i++) - if (!array()[i].sanitize (SANITIZE_ARG, base)) + if (unlikely (!array[i].sanitize (c, base))) return false; return true; } - inline bool sanitize (SANITIZE_ARG_DEF, void *base, void *base2) { + template + inline bool sanitize (hb_sanitize_context_t *c, void *base, T user_data) { TRACE_SANITIZE (); - if (!HB_LIKELY (sanitize_shallow (SANITIZE_ARG))) return false; + if (unlikely (!sanitize_shallow (c))) return false; unsigned int count = len; for (unsigned int i = 0; i < count; i++) - if (!array()[i].sanitize (SANITIZE_ARG, base, base2)) + if (unlikely (!array[i].sanitize (c, base, user_data))) return false; return true; } - inline bool sanitize (SANITIZE_ARG_DEF, void *base, unsigned int user_data) { + + private: + inline bool sanitize_shallow (hb_sanitize_context_t *c) { TRACE_SANITIZE (); - if (!HB_LIKELY (sanitize_shallow (SANITIZE_ARG))) return false; - unsigned int count = len; - for (unsigned int i = 0; i < count; i++) - if (!array()[i].sanitize (SANITIZE_ARG, base, user_data)) - return false; - return true; + return c->check_struct (this) + && c->check_array (this, Type::static_size, len); } + public: LenType len; -/*Type array[VAR];*/ + Type array[VAR]; + public: + DEFINE_SIZE_ARRAY (sizeof (LenType), array); }; /* An array with a USHORT number of elements. */ @@ -614,17 +651,18 @@ struct OffsetListOf : OffsetArrayOf { inline const Type& operator [] (unsigned int i) const { - if (HB_UNLIKELY (i >= this->len)) return Null(Type); - return this+this->array()[i]; + if (unlikely (i >= this->len)) return Null(Type); + return this+this->array[i]; } - inline bool sanitize (SANITIZE_ARG_DEF) { + inline bool sanitize (hb_sanitize_context_t *c) { TRACE_SANITIZE (); - return OffsetArrayOf::sanitize (SANITIZE_ARG, CharP(this)); + return OffsetArrayOf::sanitize (c, this); } - inline bool sanitize (SANITIZE_ARG_DEF, unsigned int user_data) { + template + inline bool sanitize (hb_sanitize_context_t *c, T user_data) { TRACE_SANITIZE (); - return OffsetArrayOf::sanitize (SANITIZE_ARG, CharP(this), user_data); + return OffsetArrayOf::sanitize (c, this, user_data); } }; @@ -634,25 +672,22 @@ struct OffsetListOf : OffsetArrayOf template struct HeadlessArrayOf { - const Type *array(void) const { return &StructAfter (len); } - Type *array(void) { return &StructAfter (len); } - inline const Type& operator [] (unsigned int i) const { - if (HB_UNLIKELY (i >= len || !i)) return Null(Type); - return array()[i-1]; + if (unlikely (i >= len || !i)) return Null(Type); + return array[i-1]; } - inline unsigned int get_size () const - { return len.get_size () + (len ? len - 1 : 0) * Type::get_size (); } + inline unsigned int get_size (void) const + { return len.static_size + (len ? len - 1 : 0) * Type::static_size; } - inline bool sanitize_shallow (SANITIZE_ARG_DEF) { - TRACE_SANITIZE (); - return SANITIZE_SELF() && SANITIZE_ARRAY (this, Type::get_size (), len); + inline bool sanitize_shallow (hb_sanitize_context_t *c) { + return c->check_struct (this) + && c->check_array (this, Type::static_size, len); } - inline bool sanitize (SANITIZE_ARG_DEF) { + inline bool sanitize (hb_sanitize_context_t *c) { TRACE_SANITIZE (); - if (!HB_LIKELY (sanitize_shallow (SANITIZE_ARG))) return false; + if (unlikely (!sanitize_shallow (c))) return false; /* Note: for structs that do not reference other structs, * we do not need to call their sanitize() as we already did * a bound check on the aggregate array size, hence the return. @@ -662,16 +697,36 @@ struct HeadlessArrayOf * to do have a simple sanitize(), ie. they do not reference * other structs. */ unsigned int count = len ? len - 1 : 0; - Type *a = array(); + Type *a = array; for (unsigned int i = 0; i < count; i++) - if (!SANITIZE (a[i])) + if (unlikely (!a[i].sanitize (c))) return false; return true; } USHORT len; -/*Type array[VAR];*/ + Type array[VAR]; + public: + DEFINE_SIZE_ARRAY (sizeof (USHORT), array); }; +/* An array with sorted elements. Supports binary searching. */ +template +struct SortedArrayOf : ArrayOf { + + template + inline int search (const SearchType &x) const { + class Cmp { + public: static int cmp (const SearchType *a, const Type *b) { return b->cmp (*a); } + }; + const Type *p = (const Type *) bsearch (&x, this->array, this->len, sizeof (this->array[0]), (hb_compare_func_t) Cmp::cmp); + return p ? p - this->array : -1; + } +}; + + +HB_BEGIN_DECLS +HB_END_DECLS + #endif /* HB_OPEN_TYPE_PRIVATE_HH */