organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-14 17:13:40 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

[vector] Fix vector error handling when allocation used to be 0

Browse source
This commit is contained in:
Behdad Esfahbod 2023-06-08 15:03:27 -06:00
parent 11308c4d1f
commit fea47dd3f2
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/hb-vector.hh
View file

@ -116,7 +116,7 @@ struct hb_vector_t
void reset ()
{
if (unlikely (in_error ()))
allocated = -allocated;
reset_error ();
resize (0);
}
@ -241,6 +241,16 @@ struct hb_vector_t
}
bool in_error () const { return allocated < 0; }
void set_error ()
{
assert (allocated >= 0);
allocated = -allocated - 1;
}
void reset_error ()
{
assert (allocated < 0);
allocated = -(allocated + 1);
}
template <typename T = Type,
hb_enable_if (hb_is_trivially_copy_assignable(T))>
@ -392,7 +402,7 @@ struct hb_vector_t
if (unlikely (overflows))
{
allocated = -allocated;
set_error ();
return false;
}
@ -403,7 +413,7 @@ struct hb_vector_t
if (new_allocated <= (unsigned) allocated)
return true; // shrinking failed; it's okay; happens in our fuzzer
allocated = -allocated;
set_error ();
return false;
}