mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

json: set state on final bare string

Browse source 
When we run out of chars and are inside a bare string, set our state
so that the next round will continue instead of looping forever.
This commit is contained in:
Wim Taymans 2020-12-31 17:07:03 +01:00
parent 49d11acde0
commit 799bc13c85
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
spa/include/spa/utils/json.h
View file

@ -164,11 +164,13 @@ static inline int spa_json_next(struct spa_json * iter, const char **value)
}
}
return (iter->depth == 0 ?
(iter->state == __BARE && iter->cur < iter->end ?
iter->cur - *value :
0) :
-1);
if (iter->depth != 0)
return -1;
if (iter->state == __BARE) {
iter->state = __STRUCT;
return iter->cur - *value;
}
return 0;
}
static inline int spa_json_enter_container(struct spa_json *iter, struct spa_json *sub, char type)

10
src/tests/test-properties.c
View file

@ -222,6 +222,16 @@ static void test_new_string(void)
spa_assert(!strcmp(pw_properties_get(props, "empty"), ""));
pw_properties_free(props);
props = pw_properties_new_string("foo=bar bar=baz");
spa_assert(props != NULL);
spa_assert(props->flags == 0);
spa_assert(props->dict.n_items == 2);
spa_assert(!strcmp(pw_properties_get(props, "foo"), "bar"));
spa_assert(!strcmp(pw_properties_get(props, "bar"), "baz"));
pw_properties_free(props);
}
static void test_update(void)