Assert against NULL pointer dereference

Change-Id: I09d538765d2e94adbd03288d0348be6f9630e0ad

diff --git a/src/listeners/dbus.c b/src/listeners/dbus.c
index b5dc701f2375d2f3d03643d204cbd5c9e62737a3..8da04d822adb0e8375f7d58eedf2f8b0e9e9f486 100644 (file)
--- a/src/listeners/dbus.c
+++ b/src/listeners/dbus.c
@@ -77,6 +77,8 @@ static int parse_message_args(GVariant *m, struct epc_object *params)
        GVariantIter iter;
        GVariant *child;
 
+       assert(NULL != m);
+
        g_variant_iter_init(&iter, m);
        while (1) {
                child = g_variant_iter_next_value(&iter);
@@ -147,6 +149,8 @@ static void on_dbus_signal_match(GDBusConnection *connection,
        struct timespec ts;
        int ret = 0;
 
+       assert(NULL != parameters);
+
        if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0) {
                log_error_errno(errno, "Unable to get timestamp : %m");
                return;
@@ -189,10 +193,8 @@ static void on_dbus_signal_match(GDBusConnection *connection,
                goto finish;
        }
 
-       if(parameters) {
-               g_variant_ref(parameters);
-               ds_ev_data.signal_params = parameters;
-       }
+       g_variant_ref(parameters);
+       ds_ev_data.signal_params = parameters;
 
        ret = epc_event_create(DBUS_SIGNAL_EVENT_ID, &ds_ev_data, &ev);
        if (ret) {