mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: handle !null checks

Browse source
This commit is contained in:
Wim Taymans 2024-03-15 10:25:32 +01:00
parent 6c6046f5ac
commit afd0affd97
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/pipewire/conf.c
View file

@ -606,18 +606,25 @@ static bool find_match(struct spa_json *arr, const struct spa_dict *props)
int len; int len;
while (spa_json_get_string(&it[0], key, sizeof(key)) > 0) { while (spa_json_get_string(&it[0], key, sizeof(key)) > 0) {
bool success = false; bool success = false, is_null;
int skip = 0; int skip = 0;
if ((len = spa_json_next(&it[0], &value)) <= 0) if ((len = spa_json_next(&it[0], &value)) <= 0)
break; break;
if (len > 0 && value[0] == '!') {
success = !success;
skip++;
}
str = spa_dict_lookup(props, key); str = spa_dict_lookup(props, key);
if (spa_json_is_null(value, len)) { is_null = spa_json_is_null(value+skip, len-skip);
success = str == NULL; if (is_null || str == NULL) {
if (is_null && str == NULL)
success = !success;
} else { } else {
if (spa_json_parse_stringn(value, len, val, sizeof(val)) < 0) if (spa_json_parse_stringn(value+skip, len-skip, val, sizeof(val)) < 0)
continue; continue;
value = val; value = val;
len = strlen(val); len = strlen(val);
@ -625,8 +632,6 @@ static bool find_match(struct spa_json *arr, const struct spa_dict *props)
success = !success; success = !success;
skip++; skip++;
} }
}
if (str != NULL) {
if (value[skip] == '~') { if (value[skip] == '~') {
regex_t preg; regex_t preg;
int res; int res;