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

Construct user_data in hb_object 

hb_object's user_data is created lazily. The previous implementation of
hb_object_set_user_data created space for the user_data but did not
actually construct it. This means that hb_user_data_array_t's lock was
not constructed. If hb_mutex_t is backed by an implementation which
requires that it be constructed (not just zero initialized) then errors
will occur when taking the lock when setting the user data.

Change hb_object_set_user_data to construct the user_data in the created
space and hb_object_fini to call the destructor.
This commit is contained in:
Ben Wagner 2021-07-29 17:35:25 -04:00 committed by Behdad Esfahbod
parent 30579f5a37
commit a78eb43c79
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hb-object.hh
View File

@ -37,6 +37,7 @@
#include "hb-mutex.hh"
#include "hb-vector.hh"
#include <new>
/*
* Lockable set
@ -284,6 +285,7 @@ static inline void hb_object_fini (Type *obj)
if (user_data)
{
user_data->fini ();
user_data->~hb_user_data_array_t();
hb_free (user_data);
user_data = nullptr;
}
@ -306,6 +308,7 @@ retry:
user_data = (hb_user_data_array_t *) hb_calloc (sizeof (hb_user_data_array_t), 1);
if (unlikely (!user_data))
return false;
user_data = new (user_data) hb_user_data_array_t;
user_data->init ();
if (unlikely (!obj->header.user_data.cmpexch (nullptr, user_data)))
{