mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-02-16 22:05:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: add spa_json_object_next

Browse source 
This gets the next key and value from an object. This function is better
because it will skip key/value pairs that don't fit in the array to hold
the key.

The previous code patter would stop parsing the object as soon as a key
larger than the available space was found.
This commit is contained in:
Wim Taymans 2024-09-13 16:26:36 +02:00
parent cd81b5f39a
commit ce390d5b22
24 changed files with 171 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/module-metadata.c
View file

@ -73,15 +73,10 @@ static int fill_metadata(struct pw_metadata *metadata, const char *str)
while (spa_json_enter_object(&it[0], &it[1]) > 0) {
char key[256], *k = NULL, *v = NULL, *t = NULL;
int id = 0;
while (spa_json_get_string(&it[1], key, sizeof(key)) > 0) {
int len;
const char *val;
if ((len = spa_json_next(&it[1], &val)) <= 0)
return -EINVAL;
int id = 0, len;
const char *val;
while ((len = spa_json_object_next(&it[1], key, sizeof(key), &val)) > 0) {
if (spa_streq(key, "id")) {
if (spa_json_parse_int(val, len, &id) <= 0)
return -EINVAL;