From c51c7b7112d102b2dc22ec875ebe1d09a661a8d9 Mon Sep 17 00:00:00 2001 From: Abhishek Chandra Date: Wed, 20 Sep 2017 17:59:23 +0530 Subject: [PATCH] Added NULL pointer guard check before g_ascii_strcasecmp. Change-Id: I04c475c9316ac04437d3ea0bc096e3da346ba421 Signed-off-by: Abhishek Chandra Signed-off-by: DoHyun Pyun --- bt-api/bt-common.c | 9 ++++++--- bt-service/bt-service-network.c | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bt-api/bt-common.c b/bt-api/bt-common.c index d3de84b..af738d5 100644 --- a/bt-api/bt-common.c +++ b/bt-api/bt-common.c @@ -1485,9 +1485,12 @@ int _bt_discover_service_uuids(char *address, char *remote_uuid) if (uuid_value) { for (i = 0; uuid_value[i] != NULL; i++) { BT_DBG("Remote uuids %s", uuid_value[i]); - if (g_ascii_strcasecmp(uuid_value[i], remote_uuid) == 0) { - result = BLUETOOTH_ERROR_NONE; - goto done; + if (uuid_value[i] == NULL) { + BT_ERR("_bt_discover_service_uuids Error Parameter are NULL..\n"); + continue; + } else if (g_ascii_strcasecmp(uuid_value[i], remote_uuid) == 0) { + result = BLUETOOTH_ERROR_NONE; + goto done; } } } diff --git a/bt-service/bt-service-network.c b/bt-service/bt-service-network.c index 00140da..bd065b2 100644 --- a/bt-service/bt-service-network.c +++ b/bt-service/bt-service-network.c @@ -100,7 +100,10 @@ static connection_profile_h __bt_get_net_profile(void *connection, if (g_strv_length(split_string) < 3) continue; - if (g_ascii_strcasecmp(split_string[2], net_address) == 0) { + if (split_string[2] == NULL) { + BT_ERR("__bt_get_net_profile Error Parameter are NULL..\n"); + continue; + } else if (g_ascii_strcasecmp(split_string[2], net_address) == 0) { BT_DBG("matched profile"); g_strfreev(split_string); return profile_h; -- 2.7.4