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

json: spa_json_get_string() writes up to len chars or fail

Browse source
This commit is contained in:
Wim Taymans 2022-01-04 10:42:32 +01:00
parent 68b31d37d9
commit c46113faa3
17 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/bluez5/quirks.c
View file

@ -110,7 +110,7 @@ static int do_match(const char *rules, struct spa_dict *dict, uint32_t *no_featu
int match = true;
uint32_t no_features_cur = 0;
while (spa_json_get_string(&it[0], key, sizeof(key)-1) > 0) {
while (spa_json_get_string(&it[0], key, sizeof(key)) > 0) {
char val[4096];
const char *str, *value;
int len;
@ -118,7 +118,7 @@ static int do_match(const char *rules, struct spa_dict *dict, uint32_t *no_featu
if (spa_streq(key, "no-features")) {
if (spa_json_enter_array(&it[0], &it[1]) > 0) {
while (spa_json_get_string(&it[1], val, sizeof(val)-1) > 0)
while (spa_json_get_string(&it[1], val, sizeof(val)) > 0)
no_features_cur |= parse_feature(val);
}
continue;
@ -183,7 +183,7 @@ static void load_quirks(struct spa_bt_quirks *this, const char *str, size_t len)
if (spa_json_enter_object(&data, &rules) <= 0)
spa_json_init(&rules, str, len);
while (spa_json_get_string(&rules, key, sizeof(key)-1) > 0) {
while (spa_json_get_string(&rules, key, sizeof(key)) > 0) {
int sz;
const char *value;

2
spa/plugins/support/log-patterns.c
View file

@ -69,7 +69,7 @@ support_log_parse_patterns(struct spa_list *patterns, const char *jsonstr)
while (spa_json_enter_object(&array, &elem) > 0) {
char pattern[512] = {0};
while (spa_json_get_string(&elem, pattern, sizeof(pattern) - 1) > 0) {
while (spa_json_get_string(&elem, pattern, sizeof(pattern)) > 0) {
struct support_log_pattern *p;
const char *val;
int len;