diff options
| author | Hansong Zhang <hsz@google.com> | 2018-07-13 16:12:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-13 16:12:06 -0700 |
| commit | a7992011a4876f39753534f4893c6e5ebd321e98 (patch) | |
| tree | 6a623ccc9da9e57a48a9d9360268f2a18c19e609 | |
| parent | aa7175ae970b8732f61fd375a51ffc5e5044fdd1 (diff) | |
| parent | e6d78b9c372dccc135a78fa6ce0a69af59a9250b (diff) | |
| download | bt-a7992011a4876f39753534f4893c6e5ebd321e98.tar.gz | |
Merge "Fix a wrong check in rfc_parse_data" into oc-dev
am: e6d78b9c37
Change-Id: Id4bc567e478860b199e7cbea2c91fc163b0cc01f
| -rw-r--r-- | stack/rfcomm/rfc_ts_frames.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stack/rfcomm/rfc_ts_frames.cc b/stack/rfcomm/rfc_ts_frames.cc index b95982708..93a85924c 100644 --- a/stack/rfcomm/rfc_ts_frames.cc +++ b/stack/rfcomm/rfc_ts_frames.cc @@ -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; 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); } else if (eal == 0) { RFCOMM_TRACE_ERROR("Bad Length when EAL = 0: %d", p_buf->len); |