Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93a929eb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into nyc-mr1-dev 

* changes:
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: aa78c8b1 am: fce74035
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: aa78c8b1
  DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
parents 95195fbb 129fee6f

system/stack/btm/btm_ble.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "device/include/controller.h"

#include "device/include/controller.h"

#include "gap_api.h"

#include "gap_api.h"

#include "hcimsgs.h"

#include "hcimsgs.h"

#include "log/log.h"

#include "l2c_int.h"

#include "l2c_int.h"

#include "osi/include/log.h"

#include "osi/include/log.h"

#include "smp_api.h"

#include "smp_api.h"
@@ -2050,6 +2051,13 @@ UINT8 btm_proc_smp_cback(tSMP_EVT event, BD_ADDR bd_addr, tSMP_EVT_DATA *p_data) 




                if (event == SMP_COMPLT_EVT)

                if (event == SMP_COMPLT_EVT)

                {

                {

                    p_dev_rec = btm_find_dev(bd_addr);

                    if (p_dev_rec == NULL)

                    {

                        BTM_TRACE_ERROR ("%s: p_dev_rec is NULL", __func__);

                        android_errorWriteLog(0x534e4554, "120612744");

                        return 0;

                    }

                    BTM_TRACE_DEBUG ("evt=SMP_COMPLT_EVT before update sec_level=0x%x sec_flags=0x%x", p_data->cmplt.sec_level , p_dev_rec->sec_flags );

                    BTM_TRACE_DEBUG ("evt=SMP_COMPLT_EVT before update sec_level=0x%x sec_flags=0x%x", p_data->cmplt.sec_level , p_dev_rec->sec_flags );





                    res = (p_data->cmplt.reason == SMP_SUCCESS) ? BTM_SUCCESS : BTM_ERR_PROCESSING;

                    res = (p_data->cmplt.reason == SMP_SUCCESS) ? BTM_SUCCESS : BTM_ERR_PROCESSING;