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

[subset] hmtx use copy writeable fn instead of direct memory

This commit is contained in:
Rod Sheeter 2018-02-14 18:42:29 -08:00
parent 27012526f9
commit 1efecd965f
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/hb-ot-hmtx-table.hh
View File

@ -68,33 +68,18 @@ struct hmtxvmtx
inline bool subset_update_header(hb_subset_plan_t *plan, inline bool subset_update_header(hb_subset_plan_t *plan,
unsigned int num_hmetrics) const unsigned int num_hmetrics) const
{ {
/* alloc the new table */
size_t dest_sz = sizeof(H);
void *dest = (void *) calloc(dest_sz, 1);
if (unlikely(!dest))
{
return false;
}
hb_blob_t *src_blob = OT::Sanitizer<H>().sanitize (plan->source->reference_table (H::tableTag)); hb_blob_t *src_blob = OT::Sanitizer<H>().sanitize (plan->source->reference_table (H::tableTag));
unsigned int src_length; hb_blob_t *dest_blob = hb_blob_copy_writable_or_fail(src_blob);
const char *src_raw = hb_blob_get_data (src_blob, &src_length);
hb_blob_destroy (src_blob); hb_blob_destroy (src_blob);
if (src_length != sizeof (H)) { if (unlikely(!dest_blob)) {
free (dest);
return false; return false;
} }
memcpy(dest, src_raw, src_length);
H *table = (H *) dest; unsigned int length;
H *table = (H *) hb_blob_get_data(dest_blob, &length);
table->numberOfLongMetrics.set (num_hmetrics); table->numberOfLongMetrics.set (num_hmetrics);
hb_blob_t *dest_blob = hb_blob_create ((const char *) dest,
dest_sz,
HB_MEMORY_MODE_READONLY,
dest,
free);
bool result = hb_subset_plan_add_table (plan, H::tableTag, dest_blob); bool result = hb_subset_plan_add_table (plan, H::tableTag, dest_blob);
hb_blob_destroy (dest_blob); hb_blob_destroy (dest_blob);