From afd0affd977de2af82c230a5e8be63492160f58c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 15 Mar 2024 10:25:32 +0100
Subject: [PATCH] conf: handle !null checks

---
 src/pipewire/conf.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pipewire/conf.c b/src/pipewire/conf.c
index 4e81baf60..d01a28d6e 100644
--- a/src/pipewire/conf.c
+++ b/src/pipewire/conf.c
@@ -606,18 +606,25 @@ static bool find_match(struct spa_json *arr, const struct spa_dict *props)
 		int len;
 
 		while (spa_json_get_string(&it[0], key, sizeof(key)) > 0) {
-			bool success = false;
+			bool success = false, is_null;
 			int skip = 0;
 
 			if ((len = spa_json_next(&it[0], &value)) <= 0)
 				break;
 
+			if (len > 0 && value[0] == '!') {
+				success = !success;
+				skip++;
+			}
+
 			str = spa_dict_lookup(props, key);
 
-			if (spa_json_is_null(value, len)) {
-				success = str == NULL;
+			is_null = spa_json_is_null(value+skip, len-skip);
+			if (is_null || str == NULL) {
+				if (is_null && str == NULL)
+					success = !success;
 			} 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;
 				value = val;
 				len = strlen(val);
@@ -625,8 +632,6 @@ static bool find_match(struct spa_json *arr, const struct spa_dict *props)
 					success = !success;
 					skip++;
 				}
-			}
-			if (str != NULL) {
 				if (value[skip] == '~') {
 					regex_t preg;
 					int res;