|
@@ -580,7 +580,7 @@ static void bt_l2cap_sdp_close_ch(void *opaque)
|
|
int i;
|
|
int i;
|
|
|
|
|
|
for (i = 0; i < sdp->services; i ++) {
|
|
for (i = 0; i < sdp->services; i ++) {
|
|
- g_free(sdp->service_list[i].attribute_list->pair);
|
|
|
|
|
|
+ g_free(sdp->service_list[i].attribute_list[0].pair);
|
|
g_free(sdp->service_list[i].attribute_list);
|
|
g_free(sdp->service_list[i].attribute_list);
|
|
g_free(sdp->service_list[i].uuid);
|
|
g_free(sdp->service_list[i].uuid);
|
|
}
|
|
}
|
|
@@ -720,6 +720,8 @@ static void sdp_service_record_build(struct sdp_service_record_s *record,
|
|
len += sdp_attr_max_size(&def->attributes[record->attributes ++].data,
|
|
len += sdp_attr_max_size(&def->attributes[record->attributes ++].data,
|
|
&record->uuids);
|
|
&record->uuids);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ assert(len > 0);
|
|
record->uuids = pow2ceil(record->uuids);
|
|
record->uuids = pow2ceil(record->uuids);
|
|
record->attribute_list =
|
|
record->attribute_list =
|
|
g_malloc0(record->attributes * sizeof(*record->attribute_list));
|
|
g_malloc0(record->attributes * sizeof(*record->attribute_list));
|
|
@@ -730,12 +732,14 @@ static void sdp_service_record_build(struct sdp_service_record_s *record,
|
|
record->attributes = 0;
|
|
record->attributes = 0;
|
|
uuid = record->uuid;
|
|
uuid = record->uuid;
|
|
while (def->attributes[record->attributes].data.type) {
|
|
while (def->attributes[record->attributes].data.type) {
|
|
|
|
+ int attribute_id = def->attributes[record->attributes].id;
|
|
record->attribute_list[record->attributes].pair = data;
|
|
record->attribute_list[record->attributes].pair = data;
|
|
|
|
+ record->attribute_list[record->attributes].attribute_id = attribute_id;
|
|
|
|
|
|
len = 0;
|
|
len = 0;
|
|
data[len ++] = SDP_DTYPE_UINT | SDP_DSIZE_2;
|
|
data[len ++] = SDP_DTYPE_UINT | SDP_DSIZE_2;
|
|
- data[len ++] = def->attributes[record->attributes].id >> 8;
|
|
|
|
- data[len ++] = def->attributes[record->attributes].id & 0xff;
|
|
|
|
|
|
+ data[len ++] = attribute_id >> 8;
|
|
|
|
+ data[len ++] = attribute_id & 0xff;
|
|
len += sdp_attr_write(data + len,
|
|
len += sdp_attr_write(data + len,
|
|
&def->attributes[record->attributes].data, &uuid);
|
|
&def->attributes[record->attributes].data, &uuid);
|
|
|
|
|
|
@@ -749,10 +753,15 @@ static void sdp_service_record_build(struct sdp_service_record_s *record,
|
|
data += len;
|
|
data += len;
|
|
}
|
|
}
|
|
|
|
|
|
- /* Sort the attribute list by the AttributeID */
|
|
|
|
|
|
+ /* Sort the attribute list by the AttributeID. The first must be
|
|
|
|
+ * SDP_ATTR_RECORD_HANDLE so that bt_l2cap_sdp_close_ch can free
|
|
|
|
+ * the buffer.
|
|
|
|
+ */
|
|
qsort(record->attribute_list, record->attributes,
|
|
qsort(record->attribute_list, record->attributes,
|
|
sizeof(*record->attribute_list),
|
|
sizeof(*record->attribute_list),
|
|
(void *) sdp_attributeid_compare);
|
|
(void *) sdp_attributeid_compare);
|
|
|
|
+ assert(record->attribute_list[0].pair == data);
|
|
|
|
+
|
|
/* Sort the searchable UUIDs list for bisection */
|
|
/* Sort the searchable UUIDs list for bisection */
|
|
qsort(record->uuid, record->uuids,
|
|
qsort(record->uuid, record->uuids,
|
|
sizeof(*record->uuid),
|
|
sizeof(*record->uuid),
|