[gjs: 5/16] dbus: Avoid null dereference in error message




commit e3494eb6be742edf8f4e60c99d471e506eae5c46
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Nov 20 18:05:24 2020 -0800

    dbus: Avoid null dereference in error message
    
    Caught by cppcheck.

 libgjs-private/gjs-gdbus-wrapper.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/libgjs-private/gjs-gdbus-wrapper.c b/libgjs-private/gjs-gdbus-wrapper.c
index b56fbd11..e46fd931 100644
--- a/libgjs-private/gjs-gdbus-wrapper.c
+++ b/libgjs-private/gjs-gdbus-wrapper.c
@@ -53,9 +53,10 @@ static gboolean gjs_dbus_implementation_check_interface(
     exported_object_path = g_dbus_interface_skeleton_get_object_path(
         G_DBUS_INTERFACE_SKELETON(self));
     if (!exported_object_path || strcmp(object_path, exported_object_path)) {
-        g_set_error(error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_OBJECT,
-                    "Wrong object path %s for %s", object_path,
-                    exported_object_path);
+        g_set_error(
+            error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_OBJECT,
+            "Wrong object path %s for %s", object_path,
+            exported_object_path ? exported_object_path : "unexported object");
         return FALSE;
     }
     if (strcmp(interface_name, self->priv->ifaceinfo->name) != 0) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]