From 7a912dee26e6af5abdb91d9c88a16d271ee92269 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Thu, 8 Jun 2017 13:55:09 +0900 Subject: [PATCH] Fix the memset size errors Change-Id: I022f15c8f8a0c9c7fa3afe835c78010b9cece3d2 Signed-off-by: DoHyun Pyun --- bt-service-emul/bt-service-dpm.c | 2 +- bt-service-emul/bt-service-util.c | 2 +- bt-service/bt-service-util.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bt-service-emul/bt-service-dpm.c b/bt-service-emul/bt-service-dpm.c index 42dee10..71e43df 100644 --- a/bt-service-emul/bt-service-dpm.c +++ b/bt-service-emul/bt-service-dpm.c @@ -173,7 +173,7 @@ dpm_result_t _bt_dpm_get_bluetooth_devices_from_blacklist(GArray **out_param1) if (list) { ret = DPM_RESULT_SUCCESS; for (; list; list = list->next, i++) { - memset(device_list.addresses[i].addr, 0, BT_ADDRESS_STRING_SIZE); + memset(device_list.addresses[i].addr, 0, BLUETOOTH_ADDRESS_LENGTH); _bt_convert_addr_string_to_type(device_list.addresses[i].addr, list->data); } device_list.count = g_slist_length(policy_table[DPM_POLICY_BLUETOOTH_DEVICES_BLACKLIST].list); diff --git a/bt-service-emul/bt-service-util.c b/bt-service-emul/bt-service-util.c index a8f9729..1021aeb 100644 --- a/bt-service-emul/bt-service-util.c +++ b/bt-service-emul/bt-service-util.c @@ -35,7 +35,7 @@ static gboolean req_id_used[BT_REQUEST_ID_RANGE_MAX]; void _bt_init_request_id(void) { assigned_id = 0; - memset(req_id_used, 0x00, BT_REQUEST_ID_RANGE_MAX); + memset(req_id_used, 0x00, sizeof(req_id_used)); } int _bt_assign_request_id(void) diff --git a/bt-service/bt-service-util.c b/bt-service/bt-service-util.c index 7a8f805..7878d77 100644 --- a/bt-service/bt-service-util.c +++ b/bt-service/bt-service-util.c @@ -38,7 +38,7 @@ bt_plugin_info_t *headed_plugin_info = NULL; void _bt_init_request_id(void) { assigned_id = 0; - memset(req_id_used, 0x00, BT_REQUEST_ID_RANGE_MAX); + memset(req_id_used, 0x00, sizeof(req_id_used)); } int _bt_assign_request_id(void) -- 2.7.4