mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

json: add spa_json_parse_stringn()

Browse source 
It also checks the destination size.
This commit is contained in:
Wim Taymans 2022-01-04 12:35:09 +01:00
parent c46113faa3
commit 611591d0fc
9 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pipewire-jack/src/match-rules.c
View file

@ -57,7 +57,8 @@ static bool find_match(struct spa_json *arr, const struct spa_dict *props)
if (spa_json_is_null(value, len)) { if (spa_json_is_null(value, len)) {
success = str == NULL; success = str == NULL;
} else { } else {
spa_json_parse_string(value, SPA_MIN(len, 1023), val); if (spa_json_parse_stringn(value, len, val, sizeof(val)) < 0)
continue;
value = val; value = val;
len = strlen(val); len = strlen(val);
} }

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

@ -314,9 +314,11 @@ static inline bool spa_json_is_string(const char *val, int len)
return len > 1 && *val == '"'; return len > 1 && *val == '"';
} }
static inline int spa_json_parse_string(const char *val, int len, char *result) static inline int spa_json_parse_stringn(const char *val, int len, char *result, int maxlen)
{ {
const char *p; const char *p;
if (maxlen <= len)
return -1;
if (!spa_json_is_string(val, len)) { if (!spa_json_is_string(val, len)) {
if (result != val) if (result != val)
strncpy(result, val, len); strncpy(result, val, len);
@ -358,13 +360,18 @@ static inline int spa_json_parse_string(const char *val, int len, char *result)
return 1; return 1;
} }
static inline int spa_json_parse_string(const char *val, int len, char *result)
{
return spa_json_parse_stringn(val, len, result, len+1);
}
static inline int spa_json_get_string(struct spa_json *iter, char *res, int maxlen) static inline int spa_json_get_string(struct spa_json *iter, char *res, int maxlen)
{ {
const char *value; const char *value;
int len; int len;
if ((len = spa_json_next(iter, &value)) <= 0 || maxlen <= len) if ((len = spa_json_next(iter, &value)) <= 0)
return -1; return -1;
return spa_json_parse_string(value, len, res); return spa_json_parse_stringn(value, len, res, maxlen);
} }
static inline int spa_json_encode_string(char *str, int size, const char *val) static inline int spa_json_encode_string(char *str, int size, const char *val)

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

@ -130,7 +130,8 @@ static int do_match(const char *rules, struct spa_dict *dict, uint32_t *no_featu
if (spa_json_is_null(value, len)) { if (spa_json_is_null(value, len)) {
value = NULL; value = NULL;
} else { } else {
spa_json_parse_string(value, SPA_MIN(len, (int)sizeof(val)-1), val); if (spa_json_parse_stringn(value, len, val, sizeof(val)) < 0)
continue;
value = val; value = val;
} }

2
src/modules/module-filter-chain.c
View file

@ -907,7 +907,7 @@ static int parse_config(struct node *node, struct spa_json *config)
len = spa_json_container_len(config, val, len); len = spa_json_container_len(config, val, len);
if ((node->config = malloc(len+1)) != NULL) if ((node->config = malloc(len+1)) != NULL)
spa_json_parse_string(val, len, node->config); spa_json_parse_stringn(val, len, node->config, len+1);
return 0; return 0;
} }

3
src/modules/module-protocol-pulse/quirks.c
View file

@ -94,7 +94,8 @@ static int match(const char *rules, struct spa_dict *dict, uint64_t *quirks)
if (spa_json_is_null(value, len)) { if (spa_json_is_null(value, len)) {
value = NULL; value = NULL;
} else { } else {
spa_json_parse_string(value, SPA_MIN(len, (int)sizeof(val)-1), val); if (spa_json_parse_stringn(value, len, val, sizeof(val)) < 0)
continue;
value = val; value = val;
} }
str = spa_dict_lookup(dict, key); str = spa_dict_lookup(dict, key);

16
src/pipewire/conf.c
View file

@ -454,18 +454,18 @@ static int parse_modules(struct pw_context *context, char *str)
if (spa_streq(key, "name")) { if (spa_streq(key, "name")) {
name = (char*)val; name = (char*)val;
spa_json_parse_string(val, len, name); spa_json_parse_stringn(val, len, name, len+1);
} else if (spa_streq(key, "args")) { } else if (spa_streq(key, "args")) {
if (spa_json_is_container(val, len)) if (spa_json_is_container(val, len))
len = spa_json_container_len(&it[2], val, len); len = spa_json_container_len(&it[2], val, len);
args = (char*)val; args = (char*)val;
spa_json_parse_string(val, len, args); spa_json_parse_stringn(val, len, args, len+1);
} else if (spa_streq(key, "flags")) { } else if (spa_streq(key, "flags")) {
if (spa_json_is_container(val, len)) if (spa_json_is_container(val, len))
len = spa_json_container_len(&it[2], val, len); len = spa_json_container_len(&it[2], val, len);
flags = (char*)val; flags = (char*)val;
spa_json_parse_string(val, len, flags); spa_json_parse_stringn(val, len, flags, len+1);
} }
} }
if (name != NULL) if (name != NULL)
@ -538,19 +538,19 @@ static int parse_objects(struct pw_context *context, char *str)
if (spa_streq(key, "factory")) { if (spa_streq(key, "factory")) {
factory = (char*)val; factory = (char*)val;
spa_json_parse_string(val, len, factory); spa_json_parse_stringn(val, len, factory, len+1);
} else if (spa_streq(key, "args")) { } else if (spa_streq(key, "args")) {
if (spa_json_is_container(val, len)) if (spa_json_is_container(val, len))
len = spa_json_container_len(&it[2], val, len); len = spa_json_container_len(&it[2], val, len);
args = (char*)val; args = (char*)val;
spa_json_parse_string(val, len, args); spa_json_parse_stringn(val, len, args, len+1);
} else if (spa_streq(key, "flags")) { } else if (spa_streq(key, "flags")) {
if (spa_json_is_container(val, len)) if (spa_json_is_container(val, len))
len = spa_json_container_len(&it[2], val, len); len = spa_json_container_len(&it[2], val, len);
flags = (char*)val; flags = (char*)val;
spa_json_parse_string(val, len, flags); spa_json_parse_stringn(val, len, flags, len+1);
} }
} }
if (factory != NULL) if (factory != NULL)
@ -625,10 +625,10 @@ static int parse_exec(struct pw_context *context, char *str)
if (spa_streq(key, "path")) { if (spa_streq(key, "path")) {
path = (char*)val; path = (char*)val;
spa_json_parse_string(val, len, path); spa_json_parse_stringn(val, len, path, len+1);
} else if (spa_streq(key, "args")) { } else if (spa_streq(key, "args")) {
args = (char*)val; args = (char*)val;
spa_json_parse_string(val, len, args); spa_json_parse_stringn(val, len, args, len+1);
} }
} }
if (path != NULL) if (path != NULL)

2
src/pipewire/properties.c
View file

@ -180,7 +180,7 @@ int pw_properties_update_string(struct pw_properties *props, const char *str, si
len = spa_json_container_len(&it[1], value, len); len = spa_json_container_len(&it[1], value, len);
if ((val = malloc(len+1)) != NULL) if ((val = malloc(len+1)) != NULL)
spa_json_parse_string(value, len, val); spa_json_parse_stringn(value, len, val, len+1);
} }
count += pw_properties_set(&impl->this, key, val); count += pw_properties_set(&impl->this, key, val);
free(val); free(val);

2
src/tools/pw-cli.c
View file

@ -1632,7 +1632,7 @@ static int json_to_pod(struct spa_pod_builder *b, uint32_t id,
} }
else { else {
char *val = alloca(len+1); char *val = alloca(len+1);
spa_json_parse_string(value, len, val); spa_json_parse_stringn(value, len, val, len+1);
switch (info ? info->parent : SPA_TYPE_Struct) { switch (info ? info->parent : SPA_TYPE_Struct) {
case SPA_TYPE_Id: case SPA_TYPE_Id:
if ((ti = find_type_info(info->values, val)) != NULL) if ((ti = find_type_info(info->values, val)) != NULL)

6
test/test-spa-json.c
View file

@ -77,7 +77,7 @@ static void expect_string(struct spa_json *it, const char *str)
pwtest_int_gt((len = spa_json_next(it, &value)), 0); pwtest_int_gt((len = spa_json_next(it, &value)), 0);
check_type(TYPE_STRING, value, len); check_type(TYPE_STRING, value, len);
s = alloca(len+1); s = alloca(len+1);
spa_json_parse_string(value, len, s); spa_json_parse_stringn(value, len, s, len+1);
pwtest_str_eq(s, str); pwtest_str_eq(s, str);
} }
static void expect_float(struct spa_json *it, float val) static void expect_float(struct spa_json *it, float val)
@ -158,7 +158,7 @@ PWTEST(json_parse)
PWTEST(json_encode) PWTEST(json_encode)
{ {
char dst[1024]; char dst[128];
char dst4[4]; char dst4[4];
char dst6[6]; char dst6[6];
char result[1024]; char result[1024];
@ -172,7 +172,7 @@ PWTEST(json_encode)
pwtest_str_eq(dst, "\"test\\\"\\n\\r \\t\\b\\f'\""); pwtest_str_eq(dst, "\"test\\\"\\n\\r \\t\\b\\f'\"");
pwtest_int_eq(spa_json_encode_string(dst, sizeof(dst), "\x04\x05\x1f\x20\x01\x7f\x90"), 29); pwtest_int_eq(spa_json_encode_string(dst, sizeof(dst), "\x04\x05\x1f\x20\x01\x7f\x90"), 29);
pwtest_str_eq(dst, "\"\\u0004\\u0005\\u001f \\u0001\x7f\x90\""); pwtest_str_eq(dst, "\"\\u0004\\u0005\\u001f \\u0001\x7f\x90\"");
pwtest_int_eq(spa_json_parse_string(dst, sizeof(dst), result), 1); pwtest_int_eq(spa_json_parse_stringn(dst, sizeof(dst), result, sizeof(result)), 1);
pwtest_str_eq(result, "\x04\x05\x1f\x20\x01\x7f\x90"); pwtest_str_eq(result, "\x04\x05\x1f\x20\x01\x7f\x90");
return PWTEST_PASS; return PWTEST_PASS;