diff options
| -rw-r--r-- | src/dbus-common.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/dbus-common.c b/src/dbus-common.c index 9bf0dabe4c..5db077b74f 100644 --- a/src/dbus-common.c +++ b/src/dbus-common.c @@ -418,9 +418,13 @@ DBusHandlerResult bus_default_message_handler( return bus_send_error_reply(c, message, &error, -EINVAL); } - } else if (!nulstr_contains(interfaces, dbus_message_get_interface(message))) { - dbus_set_error_const(&error, DBUS_ERROR_UNKNOWN_INTERFACE, "Unknown interface"); - return bus_send_error_reply(c, message, &error, -EINVAL); + } else { + const char *interface = dbus_message_get_interface(message); + + if (!interface || !nulstr_contains(interfaces, interface)) { + dbus_set_error_const(&error, DBUS_ERROR_UNKNOWN_INTERFACE, "Unknown interface"); + return bus_send_error_reply(c, message, &error, -EINVAL); + } } if (reply) { |