mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pod: improve array copy function

Browse source 
Make a new function to also returnt he child size and type.

Make a new function that accepts the array item size. Check that the
array item size and destination item size match before memcpy the array
contents. This avoids overflowing the target array with a malformed
array pod.
This commit is contained in:
Wim Taymans 2025-07-08 10:11:11 +02:00
parent ce2f9eebb4
commit d3eb06ab74
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
spa/include/spa/pod/iter.h
View file

@ -336,25 +336,36 @@ SPA_API_POD_ITER int spa_pod_is_array(const struct spa_pod *pod)
return SPA_POD_CHECK(pod, SPA_TYPE_Array, sizeof(struct spa_pod_array_body));
}
SPA_API_POD_ITER void *spa_pod_get_array(const struct spa_pod *pod, uint32_t *n_values)
SPA_API_POD_ITER void *spa_pod_get_array_full(const struct spa_pod *pod, uint32_t *n_values,
uint32_t *val_size, uint32_t *val_type)
{
spa_return_val_if_fail(spa_pod_is_array(pod), NULL);
*n_values = SPA_POD_ARRAY_N_VALUES(pod);
*val_size = SPA_POD_ARRAY_VALUE_SIZE(pod);
*val_type = SPA_POD_ARRAY_VALUE_TYPE(pod);
return SPA_POD_ARRAY_VALUES(pod);
}
SPA_API_POD_ITER uint32_t spa_pod_copy_array(const struct spa_pod *pod, uint32_t type,
void *values, uint32_t max_values)
SPA_API_POD_ITER void *spa_pod_get_array(const struct spa_pod *pod, uint32_t *n_values)
{
uint32_t n_values;
void *v = spa_pod_get_array(pod, &n_values);
if (v == NULL || max_values == 0 || SPA_POD_ARRAY_VALUE_TYPE(pod) != type)
uint32_t size, type;
return spa_pod_get_array_full(pod, n_values, &size, &type);
}
SPA_API_POD_ITER uint32_t spa_pod_copy_array_full(const struct spa_pod *pod, uint32_t type,
uint32_t size, void *values, uint32_t max_values)
{
uint32_t n_values, val_size, val_type;
void *v = spa_pod_get_array_full(pod, &n_values, &val_size, &val_type);
if (v == NULL || max_values == 0 || val_type != type || val_size != size)
return 0;
n_values = SPA_MIN(n_values, max_values);
memcpy(values, v, SPA_POD_ARRAY_VALUE_SIZE(pod) * n_values);
memcpy(values, v, val_size * n_values);
return n_values;
}
#define spa_pod_copy_array(pod,type,values,max_values) \
spa_pod_copy_array_full(pod,type,sizeof(values[0]),values,max_values)
SPA_API_POD_ITER int spa_pod_is_choice(const struct spa_pod *pod)
{
return SPA_POD_CHECK(pod, SPA_TYPE_Choice, sizeof(struct spa_pod_choice_body));