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

Commit d5843f01 authored by jonerlin's avatar jonerlin Committed by android-build-merger
Browse files

Merge "Add protection to prevent null pointer dereference." 

am: cfb36495

Change-Id: I2137ed70ac16f207586b5a239db2593d9d0d6ba4
parents 07afe834 cfb36495

system/stack/btm/btm_acl.cc

+2 −1
Original line number Original line Diff line number Diff line
@@ -825,7 +825,8 @@ void btm_use_preferred_conn_params(const RawAddress& bda) { 
  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(bda);

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(bda);





  /* If there are any preferred connection parameters, set them now */

  /* If there are any preferred connection parameters, set them now */

  if ((p_dev_rec->conn_params.min_conn_int >= BTM_BLE_CONN_INT_MIN) &&

  if ((p_lcb != NULL) && (p_dev_rec != NULL) &&

      (p_dev_rec->conn_params.min_conn_int >= BTM_BLE_CONN_INT_MIN) &&

      (p_dev_rec->conn_params.min_conn_int <= BTM_BLE_CONN_INT_MAX) &&

      (p_dev_rec->conn_params.min_conn_int <= BTM_BLE_CONN_INT_MAX) &&

      (p_dev_rec->conn_params.max_conn_int >= BTM_BLE_CONN_INT_MIN) &&

      (p_dev_rec->conn_params.max_conn_int >= BTM_BLE_CONN_INT_MIN) &&

      (p_dev_rec->conn_params.max_conn_int <= BTM_BLE_CONN_INT_MAX) &&

      (p_dev_rec->conn_params.max_conn_int <= BTM_BLE_CONN_INT_MAX) &&