Merge "Fix NULL Returns in bt-api/bt-hid-device.c" into tizen

[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-service-util.c

diff --git a/bt-service/bt-service-util.c b/bt-service/bt-service-util.c
index 7a2b94f..b1aab41 100644 (file)
--- a/bt-service/bt-service-util.c
+++ b/bt-service/bt-service-util.c
@@ -22,10 +22,9 @@
  */
 
 #include <string.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus.h>
 #include <glib.h>
 #include <dlog.h>
+#include <gio/gio.h>
 
 #include "bluetooth-api.h"
 #include "bt-service-common.h"
@@ -88,11 +87,13 @@ void _bt_init_request_list(void)
 
 /* insert request next to head */
 int _bt_insert_request_list(int req_id, int service_function,
-                       char *name, DBusGMethodInvocation *context)
+                       char *name, GDBusMethodInvocation *context)
 {
        request_info_t *info;
 
        info = g_malloc0(sizeof(request_info_t));
+       /* Fix : NULL_RETURNS */
+       retv_if(info == NULL, BLUETOOTH_ERROR_MEMORY_ALLOCATION);
 
        info->req_id = req_id;
        info->service_function = service_function;