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
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
|
Backported commit from upstream master branch (post 5.50 release), which
resolves assertion failures in several unit tests.
https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=0be5246170
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/unit/test-avctp.c b/unit/test-avctp.c
index 3bc3569..24de663 100644
--- a/unit/test-avctp.c
+++ b/unit/test-avctp.c
@@ -43,7 +43,7 @@
struct test_pdu {
bool valid;
- const uint8_t *data;
+ uint8_t *data;
size_t size;
};
@@ -66,7 +66,7 @@ struct context {
#define raw_pdu(args...) \
{ \
.valid = true, \
- .data = data(args), \
+ .data = g_memdup(data(args), sizeof(data(args))), \
.size = sizeof(data(args)), \
}
@@ -91,6 +91,11 @@ static void test_debug(const char *str, void *user_data)
static void test_free(gconstpointer user_data)
{
const struct test_data *data = user_data;
+ struct test_pdu *pdu;
+ int i;
+
+ for (i = 0; (pdu = &data->pdu_list[i]) && pdu->valid; i++)
+ g_free(pdu->data);
g_free(data->test_name);
g_free(data->pdu_list);
diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c
index dd8aed7..e2c951a 100644
--- a/unit/test-avdtp.c
+++ b/unit/test-avdtp.c
@@ -47,7 +47,7 @@
struct test_pdu {
bool valid;
bool fragmented;
- const uint8_t *data;
+ uint8_t *data;
size_t size;
};
@@ -61,7 +61,7 @@ struct test_data {
#define raw_pdu(args...) \
{ \
.valid = true, \
- .data = data(args), \
+ .data = g_memdup(data(args), sizeof(data(args))), \
.size = sizeof(data(args)), \
}
@@ -69,7 +69,7 @@ struct test_data {
{ \
.valid = true, \
.fragmented = true, \
- .data = data(args), \
+ .data = g_memdup(data(args), sizeof(data(args))), \
.size = sizeof(data(args)), \
}
@@ -81,7 +81,7 @@ struct test_data {
static struct test_data data; \
data.test_name = g_strdup(name); \
data.pdu_list = g_memdup(pdus, sizeof(pdus)); \
- tester_add(name, &data, NULL, function, NULL); \
+ tester_add(name, &data, NULL, function, NULL); \
} while (0)
struct context {
@@ -109,6 +109,11 @@ static void test_debug(const char *str, void *user_data)
static void test_free(gconstpointer user_data)
{
const struct test_data *data = user_data;
+ struct test_pdu *pdu;
+ int i;
+
+ for (i = 0; (pdu = &data->pdu_list[i]) && pdu->valid; i++)
+ g_free(pdu->data);
g_free(data->test_name);
g_free(data->pdu_list);
diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c
index 01307e6..f1aa353 100644
--- a/unit/test-avrcp.c
+++ b/unit/test-avrcp.c
@@ -49,7 +49,7 @@ struct test_pdu {
bool fragmented;
bool continuing;
bool browse;
- const uint8_t *data;
+ uint8_t *data;
size_t size;
};
@@ -74,7 +74,7 @@ struct context {
#define raw_pdu(args...) \
{ \
.valid = true, \
- .data = data(args), \
+ .data = g_memdup(data(args), sizeof(data(args))), \
.size = sizeof(data(args)), \
}
@@ -82,7 +82,7 @@ struct context {
{ \
.valid = true, \
.browse = true, \
- .data = data(args), \
+ .data = g_memdup(data(args), sizeof(data(args))), \
.size = sizeof(data(args)), \
}
@@ -90,7 +90,7 @@ struct context {
{ \
.valid = true, \
.fragmented = true, \
- .data = data(args), \
+ .data = g_memdup(data(args), sizeof(data(args))), \
.size = sizeof(data(args)), \
}
@@ -98,7 +98,7 @@ struct context {
{ \
.valid = true, \
.continuing = true, \
- .data = data(args), \
+ .data = g_memdup(data(args), sizeof(data(args))), \
.size = sizeof(data(args)), \
}
@@ -123,6 +123,11 @@ static void test_debug(const char *str, void *user_data)
static void test_free(gconstpointer user_data)
{
const struct test_data *data = user_data;
+ struct test_pdu *pdu;
+ int i;
+
+ for (i = 0; (pdu = &data->pdu_list[i]) && pdu->valid; i++)
+ g_free(pdu->data);
g_free(data->test_name);
g_free(data->pdu_list);
diff --git a/unit/test-gatt.c b/unit/test-gatt.c
index c7e28f8..d49f7a0 100644
--- a/unit/test-gatt.c
+++ b/unit/test-gatt.c
@@ -48,7 +48,7 @@
struct test_pdu {
bool valid;
- const uint8_t *data;
+ uint8_t *data;
size_t size;
};
@@ -86,7 +86,7 @@ struct context {
#define raw_pdu(args...) \
{ \
.valid = true, \
- .data = data(args), \
+ .data = g_memdup(data(args), sizeof(data(args))), \
.size = sizeof(data(args)), \
}
@@ -306,6 +306,11 @@ static bt_uuid_t uuid_char_128 = {
static void test_free(gconstpointer user_data)
{
const struct test_data *data = user_data;
+ struct test_pdu *pdu;
+ int i;
+
+ for (i = 0; (pdu = &data->pdu_list[i]) && pdu->valid; i++)
+ g_free(pdu->data);
g_free(data->test_name);
g_free(data->pdu_list);
@@ -1911,6 +1916,8 @@ static void test_server(gconstpointer data)
g_assert_cmpint(len, ==, pdu.size);
util_hexdump('<', pdu.data, len, test_debug, "GATT: ");
+
+ g_free(pdu.data);
}
static void test_search_primary(gconstpointer data)
diff --git a/unit/test-hfp.c b/unit/test-hfp.c
index f2b9622..890eee6 100644
--- a/unit/test-hfp.c
+++ b/unit/test-hfp.c
@@ -43,7 +43,7 @@ struct context {
struct test_pdu {
bool valid;
- const uint8_t *data;
+ uint8_t *data;
size_t size;
enum hfp_gw_cmd_type type;
bool fragmented;
@@ -63,7 +63,7 @@ struct test_data {
#define raw_pdu(args...) \
{ \
.valid = true, \
- .data = data(args), \
+ .data = g_memdup(data(args), sizeof(data(args))), \
.size = sizeof(data(args)), \
}
@@ -75,7 +75,7 @@ struct test_data {
#define type_pdu(cmd_type, args...) \
{ \
.valid = true, \
- .data = data(args), \
+ .data = g_memdup(data(args), sizeof(data(args))), \
.size = sizeof(data(args)), \
.type = cmd_type, \
}
@@ -83,7 +83,7 @@ struct test_data {
#define frg_pdu(args...) \
{ \
.valid = true, \
- .data = data(args), \
+ .data = g_memdup(data(args), sizeof(data(args))), \
.size = sizeof(data(args)), \
.fragmented = true, \
}
@@ -119,6 +119,11 @@ struct test_data {
static void test_free(gconstpointer user_data)
{
const struct test_data *data = user_data;
+ struct test_pdu *pdu;
+ int i;
+
+ for (i = 0; (pdu = &data->pdu_list[i]) && pdu->valid; i++)
+ g_free(pdu->data);
g_free(data->test_name);
g_free(data->pdu_list);
diff --git a/unit/test-hog.c b/unit/test-hog.c
index d117968..25bdb42 100644
--- a/unit/test-hog.c
+++ b/unit/test-hog.c
@@ -68,11 +68,11 @@ struct context {
#define data(args...) ((const unsigned char[]) { args })
-#define raw_pdu(args...) \
-{ \
- .valid = true, \
- .data = data(args), \
- .size = sizeof(data(args)),\
+#define raw_pdu(args...) \
+{ \
+ .valid = true, \
+ .data = g_memdup(data(args), sizeof(data(args))), \
+ .size = sizeof(data(args)), \
}
#define false_pdu() \
diff --git a/unit/test-sdp.c b/unit/test-sdp.c
index ac921a9..c71ee1f 100644
--- a/unit/test-sdp.c
+++ b/unit/test-sdp.c
@@ -59,14 +59,14 @@ struct test_data {
#define raw_pdu(args...) \
{ \
.valid = true, \
- .raw_data = raw_data(args), \
+ .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \
.raw_size = sizeof(raw_data(args)), \
}
#define raw_pdu_cont(cont, args...) \
{ \
.valid = true, \
- .raw_data = raw_data(args), \
+ .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \
.raw_size = sizeof(raw_data(args)), \
.cont_len = cont, \
}
@@ -103,7 +103,7 @@ struct test_data_de {
#define define_test_de_attr(name, input, exp) \
do { \
static struct test_data_de data; \
- data.input_data = input; \
+ data.input_data = g_memdup(input, sizeof(input)); \
data.input_size = sizeof(input); \
data.expected = exp; \
tester_add("/sdp/DE/ATTR/" name, &data, NULL, \
|
