mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-04-21 06:46:38 -04: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

13
src/modules/module-protocol-pulse/cmd.c
View file

@ -80,14 +80,10 @@ static int parse_cmd(void *user_data, const char *location,
while (spa_json_enter_object(&it[0], &it[1]) > 0) {
char *cmd = NULL, *args = NULL, *flags = NULL;
const char *val;
int len;
while (spa_json_get_string(&it[1], key, sizeof(key)) > 0) {
const char *val;
int len;
if ((len = spa_json_next(&it[1], &val)) <= 0)
break;
while ((len = spa_json_object_next(&it[1], key, sizeof(key), &val)) > 0) {
if (spa_streq(key, "cmd")) {
cmd = (char*)val;
spa_json_parse_stringn(val, len, cmd, len+1);
@ -99,6 +95,8 @@ static int parse_cmd(void *user_data, const char *location,
len = spa_json_container_len(&it[1], val, len);
flags = (char*)val;
spa_json_parse_stringn(val, len, flags, len+1);
} else {
pw_log_warn("unknown pulse.cmd key %s", key);
}
}
if (cmd != NULL)
@ -106,7 +104,6 @@ static int parse_cmd(void *user_data, const char *location,
if (res < 0)
break;
}
return res;
}