Null check for GError 49/245249/2
authorhyunho <hhstark.kang@samsung.com>
Tue, 6 Oct 2020 03:22:51 +0000 (12:22 +0900)
committerhyunho <hhstark.kang@samsung.com>
Tue, 6 Oct 2020 03:28:47 +0000 (12:28 +0900)
Change-Id: Ie556db6f53f861bb4afb054905d6e9662456e068
Signed-off-by: hyunho <hhstark.kang@samsung.com>
src/rua_dbus.c

index aae2c28..e910328 100644 (file)
@@ -66,17 +66,25 @@ int rua_dbus_send_update_signal(update_type type)
                                RUA_SIGNAL_DATA_UPDATE,
                                g_variant_new("(i)", type),
                                &err) == FALSE) {
-               LOGE("g_dbus_connection_emit_signal() is failed. %s",
-                               err->message);
-               g_clear_error(&err);
+               if (err != NULL) {
+                       LOGE("g_dbus_connection_emit_signal() is failed. %s",
+                                       err->message);
+                       g_clear_error(&err);
+               } else {
+                       LOGE("g_dbus_connection_emit_signal() is failed");
+               }
                __rua_dbus_exit();
                return -1;
        }
 
        if (g_dbus_connection_flush_sync(conn, NULL, &err) == FALSE) {
-               LOGE("g_dbus_connection_flush_sync() is failed. %s",
-                               err->message);
-               g_clear_error(&err);
+               if (err != NULL) {
+                       LOGE("g_dbus_connection_flush_sync() is failed. %s",
+                                       err->message);
+                       g_clear_error(&err);
+               } else {
+                       LOGE("g_dbus_connection_emit_signal() is failed");
+               }
                __rua_dbus_exit();
                return -1;
        }
@@ -208,14 +216,20 @@ static void __signal_handler(GDBusConnection *connection,
 
 static void __rua_dbus_init(void)
 {
-       if (!conn) {
-               GError *err = NULL;
-               conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
-               if (!conn) {
-                       LOGE("g_bus_get_sync() is failed. %s", err->message);
-                       g_error_free(err);
-                       return;
-               }
+       GError *err = NULL;
+
+       if (conn)
+               return;
+
+       conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
+       if (conn)
+               return;
+
+       if (err != NULL) {
+               LOGE("g_bus_get_sync() is failed. %s", err->message);
+               g_error_free(err);
+       } else {
+               LOGE("g_bus_get_sync() is failed.");
        }
 }