Fix dereferencing null pointer bug

Change-Id: I6d4dd1110af4babb881578aa2368974d3da1b911
Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/src/dbus/connection.cpp b/src/dbus/connection.cpp
index 9a4dc5b8b3efb5140b4adf769b4af8b5e0f8e8d7..7737ddc1a11a7df21114d15c77e7e1d27cf1dc0c 100644 (file)
--- a/src/dbus/connection.cpp
+++ b/src/dbus/connection.cpp
@@ -183,17 +183,18 @@ Connection::ObjectId Connection::registerObject(const std::string& object,
 {
        Error error;
        GDBusNodeInfo* node = g_dbus_node_info_new_for_xml(manifest.c_str(), &error);
-       if (node != NULL && (node->interfaces == NULL ||
-                                                node->interfaces[0] == NULL ||
-                                                node->interfaces[1] != NULL)) {
+       if (node == NULL) {
+               throw klay::Exception("Failed to create gdbus node");
+       } else if (node->interfaces == NULL ||
+                          node->interfaces[0] == NULL ||
+                          node->interfaces[1] != NULL) {
                g_dbus_node_info_unref(node);
                g_set_error(&error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
                                                        "Unexpected interface");
        }
 
-       if (error) {
+       if (error)
                throw klay::Exception(error->message);
-       }
 
        GDBusInterfaceInfo* inf = node->interfaces[0];
        GDBusInterfaceVTable vtable;