Chiebot-Mirror
/
harfbuzz
mirror of https://github.com/harfbuzz/harfbuzz.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

add pop_discard() calls to errror returns

Browse Source
pull/2230/head
ariza 5 years ago committed by Ebrahim Byagowi
parent c05458ec7f
commit 5935a1dc0b
2 changed files with 130 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 135
      src/hb-subset-cff1.cc
  2. 54
      src/hb-subset-cff2.cc

135
src/hb-subset-cff1.cc
Unescape View File

@ -714,24 +714,34 @@ static bool _serialize_cff1 (hb_serialize_context_t *c,
objidx_t subrs_link = 0; objidx_t subrs_link = 0;
if (plan.subset_localsubrs[i].length > 0) if (plan.subset_localsubrs[i].length > 0)
{ {
c->push ();
CFF1Subrs *dest = c->start_embed <CFF1Subrs> (); CFF1Subrs *dest = c->start_embed <CFF1Subrs> ();
if (unlikely (dest == nullptr)) return false; if (unlikely (dest == nullptr)) return false;
if (unlikely (!dest->serialize (c, plan.subset_localsubrs[i]))) return false; c->push ();
subrs_link = c->pop_pack (); if (likely (dest && dest->serialize (c, plan.subset_localsubrs[i])))
subrs_link = c->pop_pack ();
else
{
c->pop_discard ();
return false;
}
} }
c->push ();
PrivateDict *pd = c->start_embed<PrivateDict> (); PrivateDict *pd = c->start_embed<PrivateDict> ();
if (unlikely (pd == nullptr)) return false; if (unlikely (pd == nullptr)) return false;
bool result; c->push ();
cff_private_dict_op_serializer_t privSzr (plan.desubroutinize, plan.drop_hints); cff_private_dict_op_serializer_t privSzr (plan.desubroutinize, plan.drop_hints);
/* N.B. local subrs immediately follows its corresponding private dict. i.e., subr offset == private dict size */ /* N.B. local subrs immediately follows its corresponding private dict. i.e., subr offset == private dict size */
result = pd->serialize (c, acc.privateDicts[i], privSzr, subrs_link); if (likely (pd->serialize (c, acc.privateDicts[i], privSzr, subrs_link)))
if (unlikely (!result)) return false; {
unsigned fd = plan.fdmap[i]; unsigned fd = plan.fdmap[i];
plan.fontdicts_mod[fd].privateDictInfo.size = c->length (); plan.fontdicts_mod[fd].privateDictInfo.size = c->length ();
plan.fontdicts_mod[fd].privateDictInfo.link = c->pop_pack (); plan.fontdicts_mod[fd].privateDictInfo.link = c->pop_pack ();
}
else
{
c->pop_discard ();
return false;
}
} }
} }
@ -740,46 +750,66 @@ static bool _serialize_cff1 (hb_serialize_context_t *c,
/* CharStrings */ /* CharStrings */
{ {
c->push ();
CFF1CharStrings *cs = c->start_embed<CFF1CharStrings> (); CFF1CharStrings *cs = c->start_embed<CFF1CharStrings> ();
if (unlikely (cs == nullptr)) return false; if (unlikely (cs == nullptr)) return false;
if (unlikely (!cs->serialize (c, plan.subset_charstrings))) return false; c->push ();
plan.info.char_strings_link = c->pop_pack (); if (likely (cs->serialize (c, plan.subset_charstrings)))
plan.info.char_strings_link = c->pop_pack ();
else
{
c->pop_discard ();
return false;
}
} }
/* FDArray (FD Index) */ /* FDArray (FD Index) */
if (acc.fdArray != &Null(CFF1FDArray)) if (acc.fdArray != &Null(CFF1FDArray))
{ {
c->push ();
CFF1FDArray *fda = c->start_embed<CFF1FDArray> (); CFF1FDArray *fda = c->start_embed<CFF1FDArray> ();
if (unlikely (fda == nullptr)) return false; if (unlikely (fda == nullptr)) return false;
c->push ();
cff1_font_dict_op_serializer_t fontSzr; cff1_font_dict_op_serializer_t fontSzr;
auto it = + hb_zip (+ hb_iter (plan.fontdicts_mod), + hb_iter (plan.fontdicts_mod)); auto it = + hb_zip (+ hb_iter (plan.fontdicts_mod), + hb_iter (plan.fontdicts_mod));
if (unlikely (!fda->serialize (c, it, fontSzr))) return false; if (likely (fda->serialize (c, it, fontSzr)))
plan.info.fd_array_link = c->pop_pack (false); plan.info.fd_array_link = c->pop_pack (false);
else
{
c->pop_discard ();
return false;
}
} }
/* FDSelect */ /* FDSelect */
if (acc.fdSelect != &Null(CFF1FDSelect)) if (acc.fdSelect != &Null(CFF1FDSelect))
{ {
c->push (); c->push ();
if (unlikely (!hb_serialize_cff_fdselect (c, num_glyphs, *acc.fdSelect, acc.fdCount, if (likely (hb_serialize_cff_fdselect (c, num_glyphs, *acc.fdSelect, acc.fdCount,
plan.subset_fdselect_format, plan.info.fd_select.size, plan.subset_fdselect_format, plan.info.fd_select.size,
plan.subset_fdselect_ranges))) return false; plan.subset_fdselect_ranges)))
plan.info.fd_select.link = c->pop_pack (); plan.info.fd_select.link = c->pop_pack ();
else
{
c->pop_discard ();
return false;
}
} }
/* Charset */ /* Charset */
if (plan.subset_charset) if (plan.subset_charset)
{ {
c->push ();
Charset *dest = c->start_embed<Charset> (); Charset *dest = c->start_embed<Charset> ();
if (unlikely (dest == nullptr)) return false; if (unlikely (dest == nullptr)) return false;
if (unlikely (!dest->serialize (c, c->push ();
plan.subset_charset_format, if (likely (dest->serialize (c,
plan.num_glyphs, plan.subset_charset_format,
plan.subset_charset_ranges))) return false; plan.num_glyphs,
plan.info.charset_link = c->pop_pack (); plan.subset_charset_ranges)))
plan.info.charset_link = c->pop_pack ();
else
{
c->pop_discard ();
return false;
}
} }
/* Encoding */ /* Encoding */
@ -788,12 +818,17 @@ static bool _serialize_cff1 (hb_serialize_context_t *c,
Encoding *dest = c->start_embed<Encoding> (); Encoding *dest = c->start_embed<Encoding> ();
if (unlikely (dest == nullptr)) return false; if (unlikely (dest == nullptr)) return false;
c->push (); c->push ();
if (unlikely (!dest->serialize (c, if (likely (dest->serialize (c,
plan.subset_enc_format, plan.subset_enc_format,
plan.subset_enc_num_codes, plan.subset_enc_num_codes,
plan.subset_enc_code_ranges, plan.subset_enc_code_ranges,
plan.subset_enc_supp_codes))) return false; plan.subset_enc_supp_codes)))
plan.info.encoding_link = c->pop_pack (); plan.info.encoding_link = c->pop_pack ();
else
{
c->pop_discard ();
return false;
}
} }
/* global subrs */ /* global subrs */
@ -801,17 +836,27 @@ static bool _serialize_cff1 (hb_serialize_context_t *c,
c->push (); c->push ();
CFF1Subrs *dest = c->start_embed <CFF1Subrs> (); CFF1Subrs *dest = c->start_embed <CFF1Subrs> ();
if (unlikely (dest == nullptr)) return false; if (unlikely (dest == nullptr)) return false;
if (unlikely (!dest->serialize (c, plan.subset_globalsubrs))) return false; if (likely (dest->serialize (c, plan.subset_globalsubrs)))
c->pop_pack (); c->pop_pack ();
else
{
c->pop_discard ();
return false;
}
} }
/* String INDEX */ /* String INDEX */
{ {
c->push ();
CFF1StringIndex *dest = c->start_embed<CFF1StringIndex> (); CFF1StringIndex *dest = c->start_embed<CFF1StringIndex> ();
if (unlikely (dest == nullptr)) return false; if (unlikely (dest == nullptr)) return false;
if (unlikely (!dest->serialize (c, *acc.stringIndex, plan.sidmap))) return false; c->push ();
c->pop_pack (); if (likely (dest->serialize (c, *acc.stringIndex, plan.sidmap)))
c->pop_pack ();
else
{
c->pop_discard ();
return false;
}
} }
OT::cff1 *cff = c->allocate_min<OT::cff1> (); OT::cff1 *cff = c->allocate_min<OT::cff1> ();
@ -830,16 +875,22 @@ static bool _serialize_cff1 (hb_serialize_context_t *c,
/* top dict INDEX */ /* top dict INDEX */
{ {
/* serialize singleton TopDict */ /* serialize singleton TopDict */
c->push ();
TopDict *top = c->start_embed<TopDict> (); TopDict *top = c->start_embed<TopDict> ();
if (top == nullptr) return false; if (top == nullptr) return false;
c->push ();
cff1_top_dict_op_serializer_t topSzr; cff1_top_dict_op_serializer_t topSzr;
unsigned top_size = 0;
top_dict_modifiers_t modifier (plan.info, plan.topDictModSIDs); top_dict_modifiers_t modifier (plan.info, plan.topDictModSIDs);
if (unlikely (!top->serialize (c, plan.topdict_mod, topSzr, modifier))) if (likely (top->serialize (c, plan.topdict_mod, topSzr, modifier)))
{
top_size = c->length ();
c->pop_pack (false);
}
else
{
c->pop_discard ();
return false; return false;
unsigned top_size = c->length (); }
c->pop_pack (false);
/* serialize INDEX header for above */ /* serialize INDEX header for above */
CFF1Index *dest = c->start_embed<CFF1Index> (); CFF1Index *dest = c->start_embed<CFF1Index> ();
if (dest == nullptr) return false; if (dest == nullptr) return false;

54
src/hb-subset-cff2.cc
Unescape View File

@ -353,42 +353,62 @@ static bool _serialize_cff2 (hb_serialize_context_t *c,
if (plan.subset_localsubrs[i].length > 0) if (plan.subset_localsubrs[i].length > 0)
{ {
c->push ();
CFF2Subrs *dest = c->start_embed <CFF2Subrs> (); CFF2Subrs *dest = c->start_embed <CFF2Subrs> ();
if (unlikely (dest == nullptr)) return false; if (unlikely (dest == nullptr)) return false;
if (unlikely (!dest->serialize (c, plan.subset_localsubrs[i]))) return false; c->push ();
subrs_link = c->pop_pack (); if (likely (dest->serialize (c, plan.subset_localsubrs[i])))
subrs_link = c->pop_pack ();
else
{
c->pop_discard ();
return false;
}
} }
c->push ();
PrivateDict *pd = c->start_embed<PrivateDict> (); PrivateDict *pd = c->start_embed<PrivateDict> ();
if (unlikely (pd == nullptr)) return false; if (unlikely (pd == nullptr)) return false;
bool result; c->push ();
cff_private_dict_op_serializer_t privSzr (plan.desubroutinize, plan.drop_hints); cff_private_dict_op_serializer_t privSzr (plan.desubroutinize, plan.drop_hints);
result = pd->serialize (c, acc.privateDicts[i], privSzr, subrs_link); if (likely (pd->serialize (c, acc.privateDicts[i], privSzr, subrs_link)))
if (unlikely (!result)) return false; {
unsigned fd = plan.fdmap[i]; unsigned fd = plan.fdmap[i];
private_dict_infos[fd].size = c->length (); private_dict_infos[fd].size = c->length ();
private_dict_infos[fd].link = c->pop_pack (); private_dict_infos[fd].link = c->pop_pack ();
}
else
{
c->pop_discard ();
return false;
}
} }
} }
/* CharStrings */ /* CharStrings */
{ {
c->push ();
CFF2CharStrings *cs = c->start_embed<CFF2CharStrings> (); CFF2CharStrings *cs = c->start_embed<CFF2CharStrings> ();
if (unlikely (cs == nullptr)) return false; if (unlikely (cs == nullptr)) return false;
if (unlikely (!cs->serialize (c, plan.subset_charstrings))) return false; c->push ();
plan.info.char_strings_link = c->pop_pack (); if (likely (cs->serialize (c, plan.subset_charstrings)))
plan.info.char_strings_link = c->pop_pack ();
else
{
c->pop_discard ();
return false;
}
} }
/* FDSelect */ /* FDSelect */
if (acc.fdSelect != &Null(CFF2FDSelect)) if (acc.fdSelect != &Null(CFF2FDSelect))
{ {
c->push (); c->push ();
if (unlikely (!hb_serialize_cff_fdselect (c, num_glyphs, *(const FDSelect *)acc.fdSelect, plan.orig_fdcount, if (likely (hb_serialize_cff_fdselect (c, num_glyphs, *(const FDSelect *)acc.fdSelect, plan.orig_fdcount,
plan.subset_fdselect_format, plan.subset_fdselect_size, plan.subset_fdselect_format, plan.subset_fdselect_size,
plan.subset_fdselect_ranges))) return false; plan.subset_fdselect_ranges)))
plan.info.fd_select.link = c->pop_pack (); plan.info.fd_select.link = c->pop_pack ();
else
{
c->pop_discard ();
return false;
}
} }
/* FDArray (FD Index) */ /* FDArray (FD Index) */

Write Preview
Loading…
Cancel
Save