bus: fix counting of argN= matches

[elogind.git] / src / libsystemd-bus / bus-internal.c

diff --git a/src/libsystemd-bus/bus-internal.c b/src/libsystemd-bus/bus-internal.c
index 317f6a8a9cdea436647a59536b670fa6492236dc..32713546007d37588d5a192f386c5aab0731a38e 100644 (file)
--- a/src/libsystemd-bus/bus-internal.c
+++ b/src/libsystemd-bus/bus-internal.c
@@ -141,7 +141,6 @@ bool service_name_is_valid(const char *p) {
                 return false;
 
         return true;
-
 }
 
 bool member_name_is_valid(const char *p) {
@@ -172,6 +171,12 @@ bool member_name_is_valid(const char *p) {
 static bool complex_pattern_check(char c, const char *a, const char *b) {
         bool separator = false;
 
+        if (!a && !b)
+                return true;
+
+        if (!a || !b)
+                return false;
+
         for (;;) {
                 if (*a != *b)
                         return (separator && (*a == 0 || *b == 0)) ||
@@ -196,6 +201,13 @@ bool path_complex_pattern(const char *pattern, const char *value) {
 }
 
 static bool simple_pattern_check(char c, const char *a, const char *b) {
+
+        if (!a && !b)
+                return true;
+
+        if (!a || !b)
+                return false;
+
         for (;;) {
                 if (*a != *b)
                         return *a == 0 && *b == c;