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

Revert "Construct user_data in hb_object" 

This reverts commit a78eb43c79.

See: https://github.com/harfbuzz/harfbuzz/pull/3100#issuecomment-890088227
This commit is contained in:
Behdad Esfahbod 2021-07-30 12:52:59 -06:00
parent 5dc4cd71cc
commit 0e37c07f4c
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hb-object.hh
View File

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