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

Commit ba9e7ee3 authored by Hansong Zhang's avatar Hansong Zhang Committed by android-build-merger
Browse files

Merge "Fix a wrong check in rfc_parse_data" into oc-dev am: eadeb92e 

am: 5e3142ac

Change-Id: I2dbe619f4db2afd28f1426265e2e43c5ede9efd3
parents 41f663c1 5e3142ac

system/stack/rfcomm/rfc_ts_frames.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -520,7 +520,7 @@ uint8_t rfc_parse_data(tRFC_MCB* p_mcb, MX_FRAME* p_frame, BT_HDR* p_buf) { 




  eal = *(p_data)&RFCOMM_EA;

  eal = *(p_data)&RFCOMM_EA;

  len = *(p_data)++ >> RFCOMM_SHIFT_LENGTH1;

  len = *(p_data)++ >> RFCOMM_SHIFT_LENGTH1;

  if (eal == 0 && p_buf->len < RFCOMM_CTRL_FRAME_LEN) {

  if (eal == 0 && p_buf->len > RFCOMM_CTRL_FRAME_LEN) {

    len += (*(p_data)++ << RFCOMM_SHIFT_LENGTH2);

    len += (*(p_data)++ << RFCOMM_SHIFT_LENGTH2);

  } else if (eal == 0) {

  } else if (eal == 0) {

    RFCOMM_TRACE_ERROR("Bad Length when EAL = 0: %d", p_buf->len);

    RFCOMM_TRACE_ERROR("Bad Length when EAL = 0: %d", p_buf->len);