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

[vector] Use allocated = -1 to signify failure

This commit is contained in:
Behdad Esfahbod 2018-12-27 17:45:05 -05:00
parent 09fa536d89
commit ab2258a419
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hb-vector.hh
View File

@ -44,7 +44,7 @@ struct hb_vector_t
unsigned int length;
private:
unsigned int allocated; /* == 0 means allocation failed. */
int allocated; /* == -1 means allocation failed. */
Type *arrayZ_;
Type static_array[PreallocedCount];
public:
@ -60,8 +60,7 @@ struct hb_vector_t
{
if (arrayZ_)
free (arrayZ_);
arrayZ_ = nullptr;
allocated = length = 0;
init ();
}
void fini_deep ()
{
@ -141,12 +140,12 @@ struct hb_vector_t
return p;
}
bool in_error () const { return allocated == 0; }
bool in_error () const { return allocated < 0; }
/* Allocate for size but don't adjust length. */
bool alloc (unsigned int size)
{
if (unlikely (!allocated))
if (unlikely (allocated < 0))
return false;
if (likely (size <= allocated))
@ -168,14 +167,17 @@ struct hb_vector_t
}
else
{
bool overflows = (new_allocated < allocated) || hb_unsigned_mul_overflows (new_allocated, sizeof (Type));
bool overflows =
(int) new_allocated < 0 ||
(new_allocated < allocated) ||
hb_unsigned_mul_overflows (new_allocated, sizeof (Type));
if (likely (!overflows))
new_array = (Type *) realloc (arrayZ_, new_allocated * sizeof (Type));
}
if (unlikely (!new_array))
{
allocated = 0;
allocated = -1;
return false;
}