From: Adam Hampson <ahampson@google.com>
Date: Fri, 16 May 2014 23:41:22 +0000 (-0700)
Subject: fix uninitialized fields in tBTM_PM_PWR_MD structs
X-Git-Tag: android-x86-7.1-r1~1772^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f6418a11dd4bb80ad871dde90445b878b58e4134;p=android-x86%2Fsystem-bt.git

fix uninitialized fields in tBTM_PM_PWR_MD structs

This could potentially cause BTM_SetPowerMode() to take an
incorrect code path.

Change-Id: Ibca83129fffb5fbb64372e991cc433de144d333d
Signed-off-by: Adam Hampson <ahampson@google.com>
---

diff --git a/stack/l2cap/l2c_csm.c b/stack/l2cap/l2c_csm.c
index 4e24c238c..d8c4ed34c 100644
--- a/stack/l2cap/l2c_csm.c
+++ b/stack/l2cap/l2c_csm.c
@@ -1015,6 +1015,7 @@ static void l2c_csm_open (tL2C_CCB *p_ccb, UINT16 event, void *p_data)
 #if BTM_PWR_MGR_INCLUDED == TRUE
         {
             tBTM_PM_PWR_MD settings;
+            memset((void*)&settings, 0, sizeof(settings));
             settings.mode = BTM_PM_MD_ACTIVE;
             BTM_SetPowerMode (BTM_PM_SET_ONLY_ID, p_ccb->p_lcb->remote_bd_addr, &settings);
         }
@@ -1038,6 +1039,7 @@ static void l2c_csm_open (tL2C_CCB *p_ccb, UINT16 event, void *p_data)
 #if BTM_PWR_MGR_INCLUDED == TRUE
         {
             tBTM_PM_PWR_MD settings;
+            memset((void*)&settings, 0, sizeof(settings));
             settings.mode = BTM_PM_MD_ACTIVE;
             BTM_SetPowerMode (BTM_PM_SET_ONLY_ID, p_ccb->p_lcb->remote_bd_addr, &settings);
         }