system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-10-04 15:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

pod: only call the overflow callback when still needed

Browse source 
When we are already past the size of the buffer, don't bother calling
the overflow callback anymore, the buffer is already corrupted.

Otherwise it would be possible to have the overflow callback fail the
first time around, some data will be skipped, and then the next
overflow callback would succeed, giving the impression that all is
fine.

Add a unit test for this.
This commit is contained in:
Wim Taymans 2022-09-20 16:59:25 +02:00
parent c9753b0722
commit 7bf84fa5e2
2 changed files with 53 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
spa/include/spa/pod/builder.h
View file

@ -143,8 +143,10 @@ static inline int spa_pod_builder_raw(struct spa_pod_builder *builder, const voi
if (offset + size > builder->size) {
res = -ENOSPC;
spa_callbacks_call_res(&builder->callbacks, struct spa_pod_builder_callbacks, res,
overflow, 0, offset + size);
if (offset <= builder->size)
spa_callbacks_call_res(&builder->callbacks,
struct spa_pod_builder_callbacks, res,
overflow, 0, offset + size);
}
if (res == 0 && data)
memcpy(SPA_PTROFF(builder->data, offset, void), data, size);

49
test/test-spa-pod.c
View file

@ -1639,6 +1639,54 @@ PWTEST(pod_overflow)
return PWTEST_PASS;
}
static int handle_overflow(void *data, uint32_t size)
{
uint32_t *d = data;
(*d)++;
return -ENOSPC;
}
static struct spa_pod_builder_callbacks overflow_cb = {
SPA_VERSION_POD_BUILDER_CALLBACKS,
.overflow = handle_overflow
};
PWTEST(pod_overflow2)
{
uint8_t buffer[1024];
struct spa_pod_builder b = { 0 };
struct spa_pod_builder_state state;
struct spa_pod_frame f[2];
uint32_t idx, overflow_count = 0;
struct spa_pod *pod;
spa_pod_builder_init(&b, buffer, sizeof(buffer));
spa_pod_builder_set_callbacks(&b, &overflow_cb, &overflow_count);
spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo);
spa_pod_builder_add(&b,
SPA_PROP_INFO_id, SPA_POD_Id(32567359),
SPA_PROP_INFO_type, SPA_POD_CHOICE_ENUM_Int(1, 0),
SPA_PROP_INFO_description, SPA_POD_String("DV Timings"),
0);
spa_pod_builder_get_state(&b, &state),
spa_pod_builder_prop(&b, SPA_PROP_INFO_labels, 0);
spa_pod_builder_push_struct(&b, &f[1]);
for (idx = 0; idx < 512; idx++) {
spa_pod_builder_int(&b, idx);
spa_pod_builder_string(&b, "foo");
}
spa_assert_se(b.state.offset > sizeof(buffer));
pod = spa_pod_builder_pop(&b, &f[1]);
spa_assert_se(pod == NULL);
spa_assert_se(overflow_count == 1);
return PWTEST_PASS;
}
PWTEST_SUITE(spa_pod)
{
pwtest_add(pod_abi_sizes, PWTEST_NOARG);
@ -1652,6 +1700,7 @@ PWTEST_SUITE(spa_pod)
pwtest_add(pod_parser2, PWTEST_NOARG);
pwtest_add(pod_static, PWTEST_NOARG);
pwtest_add(pod_overflow, PWTEST_NOARG);
pwtest_add(pod_overflow2, PWTEST_NOARG);
return PWTEST_PASS;
}