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

Commit 6c5b7ca2 authored by Greg Kaiser's avatar Greg Kaiser Committed by android-build-merger
Browse files

Merge "gatt_api: Avoid possible NULL dereference" 

am: f28185ea

Change-Id: Ic37eb3f50d9458b162e12a38a9d9164119f71c69
parents f32f8cb9 f28185ea

system/stack/gatt/gatt_api.cc

+6 −6
Original line number Diff line number Diff line
@@ -625,18 +625,18 @@ tGATT_STATUS GATTC_Discover(uint16_t conn_id, tGATT_DISC_TYPE disc_type, 
  tGATT_TCB* p_tcb = gatt_get_tcb_by_idx(tcb_idx);

  tGATT_REG* p_reg = gatt_get_regcb(gatt_if);



  LOG(INFO) << __func__ << " conn_id=" << loghex(conn_id)

            << ", disc_type=" << +disc_type

            << ", s_handle=" << loghex(p_param->s_handle)

            << ", e_handle=" << loghex(p_param->e_handle);



  if ((p_tcb == NULL) || (p_reg == NULL) || (p_param == NULL) ||

      (disc_type >= GATT_DISC_MAX)) {

    LOG(ERROR) << "Illegal param: disc_type=" << +disc_type

    LOG(ERROR) << __func__ << " Illegal param: disc_type=" << +disc_type

               << " conn_id=" << loghex(conn_id);

    return GATT_ILLEGAL_PARAMETER;

  }



  LOG(INFO) << __func__ << " conn_id=" << loghex(conn_id)

            << ", disc_type=" << +disc_type

            << ", s_handle=" << loghex(p_param->s_handle)

            << ", e_handle=" << loghex(p_param->e_handle);



  if (!GATT_HANDLE_IS_VALID(p_param->s_handle) ||

      !GATT_HANDLE_IS_VALID(p_param->e_handle) ||

      /* search by type does not have a valid UUID param */