From a7b0f2355bb513293c60dc976b3ff839533d1f08 Mon Sep 17 00:00:00 2001 From: Pauli Virtanen Date: Sun, 9 Nov 2025 14:32:26 +0200 Subject: [PATCH] shared/bap: fix keeping PAC caps <-> metadata correspondence In PACS, Metadata is associated with a specific PAC. bap_pac_merge() mixes up metadatas from different PACs if some PAC has no metadata. Fix caps<->metadata correspondence by explicitly storing 0-length entry, instead of skipping it altogether, if metadata (or caps) is missing. --- src/shared/bap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/bap.c b/src/shared/bap.c index 427d18627..a18f393f7 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -3840,11 +3840,11 @@ static void *ltv_merge(struct iovec *data, struct iovec *cont) if (!data) return NULL; + util_iov_append(data, &delimiter, sizeof(delimiter)); + if (!cont || !cont->iov_len || !cont->iov_base) return data->iov_base; - util_iov_append(data, &delimiter, sizeof(delimiter)); - return util_iov_append(data, cont->iov_base, cont->iov_len); } -- 2.47.3