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

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

Merge "PAN: Always allocate in bta_pan_data_buf_ind_cback" into oc-dev

parents 0df4d880 c0106353

system/bta/pan/bta_pan_act.cc

+14 −20
Original line number Diff line number Diff line
@@ -171,16 +171,11 @@ static void bta_pan_data_flow_cb(uint16_t handle, tPAN_RESULT result) { 
static void bta_pan_data_buf_ind_cback(uint16_t handle, BD_ADDR src,

                                       BD_ADDR dst, uint16_t protocol,

                                       BT_HDR* p_buf, bool ext, bool forward) {

  tBTA_PAN_SCB* p_scb;

  BT_HDR* p_new_buf;



  p_scb = bta_pan_scb_by_handle(handle);

  tBTA_PAN_SCB* p_scb = bta_pan_scb_by_handle(handle);

  if (p_scb == NULL) {

    return;

  }



  if (sizeof(tBTA_PAN_DATA_PARAMS) > p_buf->offset) {

    /* offset smaller than data structure in front of actual data */

  if (sizeof(BT_HDR) + sizeof(tBTA_PAN_DATA_PARAMS) + p_buf->len >

      PAN_BUF_SIZE) {

    android_errorWriteLog(0x534e4554, "63146237");
@@ -188,14 +183,13 @@ static void bta_pan_data_buf_ind_cback(uint16_t handle, BD_ADDR src, 
                     p_buf->len);

    return;

  }

    p_new_buf = (BT_HDR*)osi_malloc(PAN_BUF_SIZE);



  BT_HDR* p_new_buf = (BT_HDR*)osi_malloc(PAN_BUF_SIZE);

  memcpy((uint8_t*)(p_new_buf + 1) + sizeof(tBTA_PAN_DATA_PARAMS),

         (uint8_t*)(p_buf + 1) + p_buf->offset, p_buf->len);

  p_new_buf->len = p_buf->len;

  p_new_buf->offset = sizeof(tBTA_PAN_DATA_PARAMS);

  } else {

    p_new_buf = p_buf;

  }



  /* copy params into the space before the data */

  bdcpy(((tBTA_PAN_DATA_PARAMS*)p_new_buf)->src, src);

  bdcpy(((tBTA_PAN_DATA_PARAMS*)p_new_buf)->dst, dst);

system/stack/bnep/bnep_main.cc

+0 −1
Original line number Diff line number Diff line
@@ -611,7 +611,6 @@ static void bnep_data_ind(uint16_t l2cap_cid, BT_HDR* p_buf) { 
  if (bnep_cb.p_data_buf_cb) {

    (*bnep_cb.p_data_buf_cb)(p_bcb->handle, p_src_addr, p_dst_addr, protocol,

                             p_buf, fw_ext_present);

    osi_free(p_buf);

  } else if (bnep_cb.p_data_ind_cb) {

    (*bnep_cb.p_data_ind_cb)(p_bcb->handle, p_src_addr, p_dst_addr, protocol, p,

                             rem_len, fw_ext_present);

system/stack/pan/pan_main.cc

+4 −8
Original line number Diff line number Diff line
@@ -592,12 +592,11 @@ void pan_data_buf_ind_cb(uint16_t handle, uint8_t* src, uint8_t* dst, 
      if (pan_cb.pan_data_buf_ind_cb)

        (*pan_cb.pan_data_buf_ind_cb)(pcb->handle, src, dst, protocol, p_buf,

                                      ext, forward);

      else if (pan_cb.pan_data_ind_cb) {

      else if (pan_cb.pan_data_ind_cb)

        (*pan_cb.pan_data_ind_cb)(pcb->handle, src, dst, protocol, p_data, len,

                                  ext, forward);

        osi_free(p_buf);

      }



      osi_free(p_buf);

      return;

    }
@@ -622,13 +621,10 @@ void pan_data_buf_ind_cb(uint16_t handle, uint8_t* src, uint8_t* dst, 
  if (pan_cb.pan_data_buf_ind_cb)

    (*pan_cb.pan_data_buf_ind_cb)(pcb->handle, src, dst, protocol, p_buf, ext,

                                  forward);

  else if (pan_cb.pan_data_ind_cb) {

  else if (pan_cb.pan_data_ind_cb)

    (*pan_cb.pan_data_ind_cb)(pcb->handle, src, dst, protocol, p_data, len, ext,

                              forward);

  osi_free(p_buf);

  } else

    osi_free(p_buf);



  return;

}