From 23a4cc950a314d371d849ca9867b664008865233 Mon Sep 17 00:00:00 2001
From: VenkatRaghavan VijayaRaghavan <venkatrv@broadcom.com>
Date: Thu, 5 Feb 2015 22:20:39 -0800
Subject: [PATCH] Prevent Memory overbound and initialize variables
1. Fix for initializing all the un-initialized variables
2. Potential strncpy overbound
Bug: 19417758
---
system/btif/src/btif_dm.c | 4 +++-
system/btif/src/btif_hl.c | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/system/btif/src/btif_dm.c b/system/btif/src/btif_dm.c
index 8ecb1d30ee7..de17efbf9f2 100644
--- a/system/btif/src/btif_dm.c
+++ b/system/btif/src/btif_dm.c
@@ -2503,7 +2503,9 @@ bt_status_t btif_dm_get_adapter_property(bt_property_t *prop)
case BT_PROPERTY_BDNAME:
{
bt_bdname_t *bd_name = (bt_bdname_t*)prop->val;
- strcpy((char *)bd_name->name, btif_get_default_local_name());
+ strncpy((char *)bd_name->name,btif_get_default_local_name(),
+ sizeof(bd_name->name) - 1);
+ bd_name->name[sizeof(bd_name->name) - 1] = 0;
prop->len = strlen((char *)bd_name->name);
}
break;
diff --git a/system/btif/src/btif_hl.c b/system/btif/src/btif_hl.c
index 934f2faf1ee..2420fe81334 100644
--- a/system/btif/src/btif_hl.c
+++ b/system/btif/src/btif_hl.c
@@ -1840,8 +1840,8 @@ BOOLEAN btif_hl_find_app_idx_using_deleted_mdl_id( UINT8 mdl_id,
{
p_acb =BTIF_HL_GET_APP_CB_PTR(i);
if (p_acb->delete_mdl.active) {
- BTIF_TRACE_DEBUG("btif_hl_find_app_idx_using_deleted_mdl_id: app_idx=%d,"
- "mdl_id=%d mcl_handle=%d",i,mdl_id,p_acb->mcb[i].mcl_handle);
+ BTIF_TRACE_DEBUG("%s: app_idx=%d, mdl_id=%d",
+ __FUNCTION__,i,mdl_id);
}
if (p_acb->delete_mdl.active &&
(p_acb->delete_mdl.mdl_id == mdl_id))
--
GitLab