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

Don't sanitize raw table data 

That part is performed by individual table sanitize.
This commit is contained in:
Behdad Esfahbod 2010-04-22 11:06:30 -04:00
parent c293581e96
commit 8015a8c762
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hb-open-file-private.hh
View File

@ -49,10 +49,9 @@ typedef struct TableDirectory
{ {
static inline unsigned int get_size () { return sizeof (TableDirectory); } static inline unsigned int get_size () { return sizeof (TableDirectory); }
inline bool sanitize (SANITIZE_ARG_DEF, const void *base) { inline bool sanitize (SANITIZE_ARG_DEF) {
TRACE_SANITIZE (); TRACE_SANITIZE ();
return SANITIZE_SELF () && SANITIZE (tag) && return SANITIZE_SELF ();
SANITIZE_MEM (CharP(base) + (unsigned long) offset, length);
} }
Tag tag; /* 4-byte identifier. */ Tag tag; /* 4-byte identifier. */
@ -109,12 +108,16 @@ typedef struct OffsetTable
inline unsigned int get_face_count (void) const { return 1; } inline unsigned int get_face_count (void) const { return 1; }
public: public:
inline bool sanitize (SANITIZE_ARG_DEF, const void *base) { inline bool sanitize (SANITIZE_ARG_DEF, void *base) {
TRACE_SANITIZE (); TRACE_SANITIZE ();
if (!(SANITIZE_SELF () && SANITIZE_ARRAY (tableDir, TableDirectory::get_size (), numTables))) return false; if (!(SANITIZE_SELF () && SANITIZE_ARRAY (tableDir, TableDirectory::get_size (), numTables))) return false;
return true;
/* No need to check tables individually since we don't sanitize the
* referenced table, just the table directory. Code retaind to make
* sure TableDirectory has a baseless sanitize(). */
unsigned int count = numTables; unsigned int count = numTables;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
if (!SANITIZE_BASE (tableDir[i], base)) if (!SANITIZE (tableDir[i]))
return false; return false;
return true; return true;
} }
@ -200,7 +203,7 @@ struct OpenTypeFontFile
inline const char* get_table_data (const OpenTypeTable& table) const inline const char* get_table_data (const OpenTypeTable& table) const
{ {
if (HB_UNLIKELY (table.offset == 0)) return NULL; if (HB_UNLIKELY (table.offset == 0)) return NULL;
return ((const char*) this) + table.offset; return CharP(this) + table.offset;
} }
inline bool sanitize (SANITIZE_ARG_DEF) { inline bool sanitize (SANITIZE_ARG_DEF) {