chiark / gitweb /
bus: fix build
authorLennart Poettering <lennart@poettering.net>
Wed, 30 Oct 2013 01:38:52 +0000 (02:38 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 30 Oct 2013 01:38:52 +0000 (02:38 +0100)
src/libsystemd-bus/bus-match.c
src/libsystemd-bus/bus-objects.c

index 49fc6335c23d0815b951a5aefd25fb7655e951e1..61b8a5cd8878570b034b52b8df33b97e8d33e89a 100644 (file)
@@ -153,7 +153,7 @@ static bool value_node_test(
                  * should contain all well-known names of the sender,
                  * hence we can fix things there correctly. */
 
                  * should contain all well-known names of the sender,
                  * hence we can fix things there correctly. */
 
-                if (node->value.str[0] != ':' && value_str[0] == ':')
+                if (node->value.str[0] != ':' && value_str && value_str[0] == ':')
                         return true;
 
                 return false;
                         return true;
 
                 return false;
index 5867907a624a393dd7274f28e1291dbf57812778..05d0015902075850c6ce0b13480b63365a3dd038 100644 (file)
@@ -600,7 +600,7 @@ static int property_get_all_callbacks_run(
         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 
-        found_interface =
+        found_interface = !iface ||
                 streq(iface, "org.freedesktop.DBus.Properties") ||
                 streq(iface, "org.freedesktop.DBus.Peer") ||
                 streq(iface, "org.freedesktop.DBus.Introspectable");
                 streq(iface, "org.freedesktop.DBus.Properties") ||
                 streq(iface, "org.freedesktop.DBus.Peer") ||
                 streq(iface, "org.freedesktop.DBus.Introspectable");