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

[post] Minor

This commit is contained in:
Behdad Esfahbod 2018-11-10 00:37:17 -05:00
parent 4111c3b8cd
commit b308aaccf0
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hb-ot-post-table.hh
View File

@ -77,11 +77,11 @@ struct post
{ {
unsigned int post_prime_length; unsigned int post_prime_length;
hb_blob_t *post_blob = hb_sanitize_context_t().reference_table<post>(plan->source); hb_blob_t *post_blob = hb_sanitize_context_t().reference_table<post>(plan->source);
hb_blob_t *post_prime_blob = hb_blob_create_sub_blob (post_blob, 0, post::static_size); hb_blob_t *post_prime_blob = hb_blob_create_sub_blob (post_blob, 0, post::min_size);
post *post_prime = (post *) hb_blob_get_data_writable (post_prime_blob, &post_prime_length); post *post_prime = (post *) hb_blob_get_data_writable (post_prime_blob, &post_prime_length);
hb_blob_destroy (post_blob); hb_blob_destroy (post_blob);
if (unlikely (!post_prime || post_prime_length != post::static_size)) if (unlikely (!post_prime || post_prime_length != post::min_size))
{ {
hb_blob_destroy (post_prime_blob); hb_blob_destroy (post_prime_blob);
DEBUG_MSG(SUBSET, nullptr, "Invalid source post table with length %d.", post_prime_length); DEBUG_MSG(SUBSET, nullptr, "Invalid source post table with length %d.", post_prime_length);
@ -109,7 +109,7 @@ struct post
if (version != 0x00020000) if (version != 0x00020000)
return; return;
const postV2Tail &v2 = StructAfter<postV2Tail> (*table); const postV2Tail &v2 = table->v2;
glyphNameIndex = &v2.glyphNameIndex; glyphNameIndex = &v2.glyphNameIndex;
pool = &StructAfter<uint8_t> (v2.glyphNameIndex); pool = &StructAfter<uint8_t> (v2.glyphNameIndex);
@ -255,14 +255,10 @@ struct post
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
if (unlikely (!c->check_struct (this))) return_trace (likely (c->check_struct (this) &&
return_trace (false); (version.to_int () == 0x00010000 ||
if (version.to_int () == 0x00020000) (version.to_int () == 0x00020000 && v2.sanitize (c)) ||
{ version.to_int () == 0x00030000)));
const postV2Tail &v2 = StructAfter<postV2Tail> (*this);
return_trace (v2.sanitize (c));
}
return_trace (true);
} }
public: public:
@ -297,8 +293,8 @@ struct post
* is downloaded as a Type 1 font. */ * is downloaded as a Type 1 font. */
HBUINT32 maxMemType1; /* Maximum memory usage when an OpenType font HBUINT32 maxMemType1; /* Maximum memory usage when an OpenType font
* is downloaded as a Type 1 font. */ * is downloaded as a Type 1 font. */
/*postV2Tail v2[VAR];*/ postV2Tail v2;
DEFINE_SIZE_STATIC (32); DEFINE_SIZE_MIN (32);
}; };
struct post_accelerator_t : post::accelerator_t {}; struct post_accelerator_t : post::accelerator_t {};