SVACE Fixes

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-event-handler.c

diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c
index 8e2a0f7..b2ad54a 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -3063,6 +3063,10 @@ static void __bt_otp_event_filter(GDBusConnection *connection,
 
                /* Extract data from DBUS params */
                g_variant_get(parameters, "(i&sn@ay)", &result, &handle, &data_len, &var);
+               if (!var) {
+                       BT_ERR("No data");
+                       return;
+               }
                data = (char *)g_variant_get_data(var);
 
                BT_DBG("Handle [%s]", handle);
@@ -3091,8 +3095,7 @@ static void __bt_otp_event_filter(GDBusConnection *connection,
                        g_free(info->data);
                        g_free(info);
                }
-               if (var)
-                       g_variant_unref(var);
+               g_variant_unref(var);
        } else if (strcasecmp(signal_name, BT_OTP_NOTIFICATION_ENABLED) == 0) {
                BT_DBG("OTP Notification Enabled event");
                char *handle = NULL;
@@ -3125,6 +3128,10 @@ static void __bt_otp_event_filter(GDBusConnection *connection,
                char *handle = NULL;
 
                g_variant_get(parameters, "(i&s@ay)", &result, &handle, &byte_var);
+               if (!byte_var) {
+                       BT_ERR("No Indication data from Server");
+                       return;
+               }
 
                ind_res = g_malloc0(sizeof(bluetooth_otp_resp_info_t));
                ind_res->data_length = g_variant_get_size(byte_var);
@@ -3143,8 +3150,7 @@ static void __bt_otp_event_filter(GDBusConnection *connection,
                        g_free(ind_res->data);
                        g_free(ind_res);
                }
-               if (byte_var)
-                       g_variant_unref(byte_var);
+               g_variant_unref(byte_var);
        }  else if (strcasecmp(signal_name, BT_OTC_STATE_CHANGED) == 0) {
                BT_DBG("OTC State Changed");
                char *address = NULL;