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

[cff] Simplify str_encoder_t error handling

This commit is contained in:
Behdad Esfahbod 2022-11-21 17:17:15 -07:00
parent f263e3fe2e
commit 2cadacad6c
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,16 +38,12 @@ namespace CFF {
struct str_encoder_t struct str_encoder_t
{ {
str_encoder_t (str_buff_t &buff_) str_encoder_t (str_buff_t &buff_)
: buff (buff_), error (false) {} : buff (buff_) {}
void reset () { buff.reset (); } void reset () { buff.reset (); }
void encode_byte (unsigned char b) void encode_byte (unsigned char b)
{ { buff.push (b); }
buff.push (b);
if (unlikely (buff.in_error ()))
set_error ();
}
void encode_int (int v) void encode_int (int v)
{ {
@ -115,10 +111,8 @@ struct str_encoder_t
if (likely ((signed) (buff.length + str.length) <= buff.allocated)) if (likely ((signed) (buff.length + str.length) <= buff.allocated))
buff.length += str.length; buff.length += str.length;
else if (unlikely (!buff.resize (offset + str.length))) else if (unlikely (!buff.resize (offset + str.length)))
{
set_error ();
return; return;
}
/* Since our strings are one or two bytes typically, /* Since our strings are one or two bytes typically,
* this is faster than memcpy. */ * this is faster than memcpy. */
for (unsigned i = 0; i < str.length; i++) for (unsigned i = 0; i < str.length; i++)
@ -126,13 +120,11 @@ struct str_encoder_t
// memcpy (buff.arrayZ + offset, &str[0], str.length); // memcpy (buff.arrayZ + offset, &str[0], str.length);
} }
bool is_error () const { return error; } bool is_error () const { return buff.in_error (); }
protected: protected:
void set_error () { error = true; }
str_buff_t &buff; str_buff_t &buff;
bool error;
}; };
struct cff_sub_table_info_t { struct cff_sub_table_info_t {