1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
|
From 93f7c1652a05e806c2e3ac7edf498d2f4a508a3a Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 14 Nov 2017 10:59:54 -0800
Subject: [PATCH] Revert "[glib/ucdn/icu/ft/ot] Make returned funcs inert"
This reverts commit 5daf3bd4494cce6b4fb074533be9e99c4d9e0edd.
If other atexit callbacks try to destruct the objects we destruct
in atexit callbacks, bad things will happen.
I'll come up with some other way to catch premature destruction
of HB-owned objects.
Fixes https://github.com/behdad/harfbuzz/issues/618
---
src/hb-ft.cc | 3 ---
src/hb-glib.cc | 3 ---
src/hb-icu.cc | 3 ---
src/hb-object-private.hh | 37 ++++++-------------------------------
src/hb-ot-font.cc | 3 ---
src/hb-ucdn.cc | 3 ---
6 files changed, 6 insertions(+), 46 deletions(-)
diff --git src/hb-ft.cc src/hb-ft.cc
index 68c774547..0f15f8c3d 100644
--- src/hb-ft.cc
+++ src/hb-ft.cc
@@ -423,7 +423,6 @@ static hb_font_funcs_t *static_ft_funcs = nullptr;
static
void free_static_ft_funcs (void)
{
- hb_object_undo_inert (static_ft_funcs);
hb_font_funcs_destroy (static_ft_funcs);
}
#endif
@@ -454,10 +453,8 @@ _hb_ft_font_set_funcs (hb_font_t *font, FT_Face ft_face, bool unref)
hb_font_funcs_set_glyph_from_name_func (funcs, hb_ft_get_glyph_from_name, nullptr, nullptr);
hb_font_funcs_make_immutable (funcs);
- hb_object_make_inert (funcs);
if (!hb_atomic_ptr_cmpexch (&static_ft_funcs, nullptr, funcs)) {
- hb_object_undo_inert (funcs);
hb_font_funcs_destroy (funcs);
goto retry;
}
diff --git src/hb-glib.cc src/hb-glib.cc
index 31de68e86..50c30e9c7 100644
--- src/hb-glib.cc
+++ src/hb-glib.cc
@@ -370,7 +370,6 @@ static hb_unicode_funcs_t *static_glib_funcs = nullptr;
static
void free_static_glib_funcs (void)
{
- hb_object_undo_inert (static_glib_funcs);
hb_unicode_funcs_destroy (static_glib_funcs);
}
#endif
@@ -391,10 +390,8 @@ hb_glib_get_unicode_funcs (void)
#undef HB_UNICODE_FUNC_IMPLEMENT
hb_unicode_funcs_make_immutable (funcs);
- hb_object_make_inert (funcs);
if (!hb_atomic_ptr_cmpexch (&static_glib_funcs, nullptr, funcs)) {
- hb_object_undo_inert (funcs);
hb_unicode_funcs_destroy (funcs);
goto retry;
}
diff --git src/hb-icu.cc src/hb-icu.cc
index 44a198937..552eaeca5 100644
--- src/hb-icu.cc
+++ src/hb-icu.cc
@@ -351,7 +351,6 @@ static hb_unicode_funcs_t *static_icu_funcs = nullptr;
static
void free_static_icu_funcs (void)
{
- hb_object_undo_inert (static_icu_funcs);
hb_unicode_funcs_destroy (static_icu_funcs);
}
#endif
@@ -380,10 +379,8 @@ hb_icu_get_unicode_funcs (void)
#undef HB_UNICODE_FUNC_IMPLEMENT
hb_unicode_funcs_make_immutable (funcs);
- hb_object_make_inert (funcs);
if (!hb_atomic_ptr_cmpexch (&static_icu_funcs, nullptr, funcs)) {
- hb_object_undo_inert (funcs);
hb_unicode_funcs_destroy (funcs);
goto retry;
}
diff --git src/hb-object-private.hh src/hb-object-private.hh
index 0dada492c..baa1f8f05 100644
--- src/hb-object-private.hh
+++ src/hb-object-private.hh
@@ -41,10 +41,9 @@
/* reference_count */
-#define HB_REFERENCE_COUNT_UNCHANGABLE_VALUE -0x53043
-#define HB_REFERENCE_COUNT_UNREFFABLE_VALUE -0x07734
-#define HB_REFERENCE_COUNT_UNTOUCHABLE_VALUE -0xBEDAD
-#define HB_REFERENCE_COUNT_INIT {HB_ATOMIC_INT_INIT (HB_REFERENCE_COUNT_UNCHANGABLE_VALUE)}
+#define HB_REFERENCE_COUNT_INERT_VALUE -1
+#define HB_REFERENCE_COUNT_POISON_VALUE -0x0000DEAD
+#define HB_REFERENCE_COUNT_INIT {HB_ATOMIC_INT_INIT(HB_REFERENCE_COUNT_INERT_VALUE)}
struct hb_reference_count_t
{
@@ -54,23 +53,9 @@ struct hb_reference_count_t
inline int get_unsafe (void) const { return ref_count.get_unsafe (); }
inline int inc (void) { return ref_count.inc (); }
inline int dec (void) { return ref_count.dec (); }
- inline void finish (void) { ref_count.set_unsafe (HB_REFERENCE_COUNT_UNTOUCHABLE_VALUE); }
-
- inline void make_inert (void)
- {
- if (get_unsafe () == HB_REFERENCE_COUNT_UNCHANGABLE_VALUE)
- return;
- ref_count.set_unsafe (HB_REFERENCE_COUNT_UNREFFABLE_VALUE);
- }
- inline void undo_inert (void)
- {
- if (get_unsafe () == HB_REFERENCE_COUNT_UNCHANGABLE_VALUE)
- return;
- assert (get_unsafe () == HB_REFERENCE_COUNT_UNREFFABLE_VALUE);
- ref_count.set_unsafe (1);
- }
-
- inline bool is_inert (void) const { return ref_count.get_unsafe () < 0; }
+ inline void finish (void) { ref_count.set_unsafe (HB_REFERENCE_COUNT_POISON_VALUE); }
+
+ inline bool is_inert (void) const { return ref_count.get_unsafe () == HB_REFERENCE_COUNT_INERT_VALUE; }
inline bool is_valid (void) const { return ref_count.get_unsafe () > 0; }
};
@@ -161,16 +146,6 @@ static inline bool hb_object_is_valid (const Type *obj)
return likely (obj->header.ref_count.is_valid ());
}
template <typename Type>
-static inline void hb_object_make_inert (Type *obj)
-{
- obj->header.ref_count.make_inert ();
-}
-template <typename Type>
-static inline void hb_object_undo_inert (Type *obj)
-{
- obj->header.ref_count.undo_inert ();
-}
-template <typename Type>
static inline Type *hb_object_reference (Type *obj)
{
hb_object_trace (obj, HB_FUNC);
diff --git src/hb-ot-font.cc src/hb-ot-font.cc
index 72d3c5836..47416012c 100644
--- src/hb-ot-font.cc
+++ src/hb-ot-font.cc
@@ -663,7 +663,6 @@ static hb_font_funcs_t *static_ot_funcs = nullptr;
static
void free_static_ot_funcs (void)
{
- hb_object_undo_inert (static_ot_funcs);
hb_font_funcs_destroy (static_ot_funcs);
}
#endif
@@ -694,10 +693,8 @@ _hb_ot_get_font_funcs (void)
hb_font_funcs_set_glyph_from_name_func (funcs, hb_ot_get_glyph_from_name, nullptr, nullptr);
hb_font_funcs_make_immutable (funcs);
- hb_object_make_inert (funcs);
if (!hb_atomic_ptr_cmpexch (&static_ot_funcs, nullptr, funcs)) {
- hb_object_undo_inert (funcs);
hb_font_funcs_destroy (funcs);
goto retry;
}
diff --git src/hb-ucdn.cc src/hb-ucdn.cc
index 99266724f..9515bda25 100644
--- src/hb-ucdn.cc
+++ src/hb-ucdn.cc
@@ -237,7 +237,6 @@ static hb_unicode_funcs_t *static_ucdn_funcs = nullptr;
static
void free_static_ucdn_funcs (void)
{
- hb_object_undo_inert (static_ucdn_funcs);
hb_unicode_funcs_destroy (static_ucdn_funcs);
}
#endif
@@ -259,10 +258,8 @@ hb_ucdn_get_unicode_funcs (void)
#undef HB_UNICODE_FUNC_IMPLEMENT
hb_unicode_funcs_make_immutable (funcs);
- hb_object_make_inert (funcs);
if (!hb_atomic_ptr_cmpexch (&static_ucdn_funcs, nullptr, funcs)) {
- hb_object_undo_inert (funcs);
hb_unicode_funcs_destroy (funcs);
goto retry;
}
|
