Fix incorrect memory validation for g_malloc*()

[platform/core/connectivity/bluetooth-frwk.git] / bt-service-emul / bt-service-event-manager.c

diff --git a/bt-service-emul/bt-service-event-manager.c b/bt-service-emul/bt-service-event-manager.c
index e82f3f5..5462b20 100644 (file)
--- a/bt-service-emul/bt-service-event-manager.c
+++ b/bt-service-emul/bt-service-event-manager.c
@@ -117,8 +117,6 @@ void _bt_create_event_timer(int event_id, int interval, void *event_cb, void *us
        BT_DBG("+");
 
        event_info = g_malloc0(sizeof(bt_timer_info_t));
-       /* Fix : NULL_RETURNS */
-       ret_if(event_info == NULL);
 
        _bt_delete_event_timer(event_id);
 
@@ -192,7 +190,6 @@ bt_remote_dev_info_t *_bt_get_sample_device(int index)
        bt_remote_dev_info_t *dev_info;
 
        dev_info = g_malloc0(sizeof(bt_remote_dev_info_t));
-       retv_if(dev_info == NULL, NULL);
 
        dev_info->rssi = sample_devices[index].rssi;
        dev_info->class = sample_devices[index].class;
@@ -220,9 +217,8 @@ bt_remote_dev_info_t *_bt_get_sample_device(int index)
 
        if (dev_info->manufacturer_data_len > 0) {
                dev_info->manufacturer_data = g_malloc0(dev_info->manufacturer_data_len);
-               if (dev_info->manufacturer_data)
-                       memcpy(dev_info->manufacturer_data, sample_devices[index].manufacturer_data,
-                                       dev_info->manufacturer_data_len);
+               memcpy(dev_info->manufacturer_data, sample_devices[index].manufacturer_data,
+                               dev_info->manufacturer_data_len);
        }
 
        return dev_info;