fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 16:58:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Remove an unnecessary NULL check in sd-activation

Browse source 
test_transient_services() was checking whether (config == NULL), then
shortly afterwards dereferencing config->bus_name (which is in fact
dereferenced on all branches of the function). Remove the check and add
some assertions to ensure a Config struct is always passed into the test
(which it currently is).

Coverity ID: 141877

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99999
Reviewed-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Philip Withnall 2017-02-28 08:56:25 +00:00 • committed by Simon McVittie
parent f6cee5f046
commit d42905bc04
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/sd-activation.c
View file

@ -742,6 +742,9 @@ test_deny_receive (Fixture *f,
DBusMessage *m;
const Config *config = context;
g_assert (config != NULL);
g_assert (config->bus_name != NULL);
if (f->address == NULL)
return;
@ -852,6 +855,9 @@ test_transient_services (Fixture *f,
DBusMessage *reply = NULL;
DBusPendingCall *pc;
g_assert (config != NULL);
g_assert (config->bus_name != NULL);
if (f->address == NULL)
return;
@ -863,7 +869,7 @@ test_transient_services (Fixture *f,
f->systemd_name = dbus_bus_get_unique_name (f->systemd);
take_well_known_name (f, f->systemd, "org.freedesktop.systemd1");
if (config == NULL || (config->flags & FLAG_EARLY_TRANSIENT_SERVICE) == 0)
if ((config->flags & FLAG_EARLY_TRANSIENT_SERVICE) == 0)
{
/* Try to activate a service that isn't there. */
m = dbus_message_new_method_call (config->bus_name,