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

[subset] In CFF accelerator keep a reference to original face. 

The charstring objects reference memory from the original face so we need to maintain a reference to prevent it from being destroyed.
This commit is contained in:
Garret Rieger 2022-11-24 22:47:29 +00:00
parent a3afa61ce8
commit 4ff09274a8
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hb-subset-cff-common.hh
View File

@ -405,12 +405,14 @@ struct parsed_cs_str_vec_t : hb_vector_t<parsed_cs_str_t>
struct cff_subset_accelerator_t struct cff_subset_accelerator_t
{ {
static cff_subset_accelerator_t* create( static cff_subset_accelerator_t* create(
hb_face_t* original_face,
const parsed_cs_str_vec_t& parsed_charstrings, const parsed_cs_str_vec_t& parsed_charstrings,
const parsed_cs_str_vec_t& parsed_global_subrs, const parsed_cs_str_vec_t& parsed_global_subrs,
const hb_vector_t<parsed_cs_str_vec_t>& parsed_local_subrs) { const hb_vector_t<parsed_cs_str_vec_t>& parsed_local_subrs) {
cff_subset_accelerator_t* accel = cff_subset_accelerator_t* accel =
(cff_subset_accelerator_t*) hb_malloc (sizeof(cff_subset_accelerator_t)); (cff_subset_accelerator_t*) hb_malloc (sizeof(cff_subset_accelerator_t));
new (accel) cff_subset_accelerator_t (parsed_charstrings, new (accel) cff_subset_accelerator_t (original_face,
parsed_charstrings,
parsed_global_subrs, parsed_global_subrs,
parsed_local_subrs); parsed_local_subrs);
return accel; return accel;
@ -425,19 +427,29 @@ struct cff_subset_accelerator_t
} }
cff_subset_accelerator_t( cff_subset_accelerator_t(
hb_face_t* original_face_,
const parsed_cs_str_vec_t& parsed_charstrings_, const parsed_cs_str_vec_t& parsed_charstrings_,
const parsed_cs_str_vec_t& parsed_global_subrs_, const parsed_cs_str_vec_t& parsed_global_subrs_,
const hb_vector_t<parsed_cs_str_vec_t>& parsed_local_subrs_) const hb_vector_t<parsed_cs_str_vec_t>& parsed_local_subrs_)
{ {
// the parsed charstrings point to memory in the original face so we must hold a reference
// to it to keep the memory valid.
original_face = hb_face_reference (original_face_);
parsed_charstrings = parsed_charstrings_; parsed_charstrings = parsed_charstrings_;
parsed_global_subrs = parsed_global_subrs_; parsed_global_subrs = parsed_global_subrs_;
parsed_local_subrs = parsed_local_subrs_; parsed_local_subrs = parsed_local_subrs_;
} }
~cff_subset_accelerator_t() {
hb_face_destroy (original_face);
}
parsed_cs_str_vec_t parsed_charstrings; parsed_cs_str_vec_t parsed_charstrings;
parsed_cs_str_vec_t parsed_global_subrs; parsed_cs_str_vec_t parsed_global_subrs;
hb_vector_t<parsed_cs_str_vec_t> parsed_local_subrs; hb_vector_t<parsed_cs_str_vec_t> parsed_local_subrs;
private:
hb_face_t* original_face;
}; };
struct subr_subset_param_t struct subr_subset_param_t
@ -983,7 +995,8 @@ struct subr_subsetter_t
if (!plan->inprogress_accelerator) return; if (!plan->inprogress_accelerator) return;
plan->inprogress_accelerator->cff_accelerator = plan->inprogress_accelerator->cff_accelerator =
cff_subset_accelerator_t::create(parsed_charstrings, cff_subset_accelerator_t::create(plan->source,
parsed_charstrings,
parsed_global_subrs, parsed_global_subrs,
parsed_local_subrs); parsed_local_subrs);