diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-13 07:59:45 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-13 07:59:45 +0000 |
| commit | 78cd316c800740b9e1dadd6808e776a931634376 (patch) | |
| tree | cc59bfec58e1f01db448f2587cd8be9dcbed68dd | |
| parent | 1224b2983f8ba4e20676e73439f0fbf6252afb1b (diff) | |
| parent | da58eba5009b7c0a7debe144ce1c86ae35ac261d (diff) | |
| download | Nfc-android10-mainline-tzdata-release.tar.gz | |
Snap for 9170954 from da58eba5009b7c0a7debe144ce1c86ae35ac261d to qt-aml-tzdata-releaseq_tzdata_aml_295500002q_tzdata_aml_295500001android10-mainline-tzdata-release
Change-Id: I49c73ad7b94154b5505c01190603dc264347d086
| -rw-r--r-- | nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp index 06934331..a54f2c89 100644 --- a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp +++ b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp @@ -1117,8 +1117,9 @@ static NFCSTATUS phNciNfc_RecvMfResp(phNciNfc_Buff_t* RspBuffInfo, if (NULL == RspBuffInfo) { status = NFCSTATUS_FAILED; } else { - if ((0 == (RspBuffInfo->wLen)) || (PH_NCINFC_STATUS_OK != wStatus) || - (NULL == (RspBuffInfo->pBuff))) { + if (((PHNCINFC_EXTNID_SIZE + PHNCINFC_EXTNSTATUS_SIZE) > + RspBuffInfo->wLen) || + (PH_NCINFC_STATUS_OK != wStatus) || (NULL == (RspBuffInfo->pBuff))) { status = NFCSTATUS_FAILED; } else { RecvdExtnRspId = (phNciNfc_ExtnRespId_t)RspBuffInfo->pBuff[0]; @@ -1132,10 +1133,6 @@ static NFCSTATUS phNciNfc_RecvMfResp(phNciNfc_Buff_t* RspBuffInfo, NdefMap->State == PH_FRINFC_NDEFMAP_STATE_WRITE || NdefMap->State == PH_FRINFC_NDEFMAP_STATE_WR_NDEF_LEN || NdefMap->State == PH_FRINFC_NDEFMAP_STATE_INIT)) { - if (2 > RspBuffInfo->wLen) { - android_errorWriteLog(0x534e4554, "181346550"); - return NFCSTATUS_FAILED; - } uint8_t rspAck = RspBuffInfo->pBuff[RspBuffInfo->wLen - 2]; uint8_t rspAckMask = ((RspBuffInfo->pBuff[RspBuffInfo->wLen - 1]) & MAX_NUM_VALID_BITS_FOR_ACK); @@ -1149,11 +1146,6 @@ static NFCSTATUS phNciNfc_RecvMfResp(phNciNfc_Buff_t* RspBuffInfo, status = NFCSTATUS_SUCCESS; uint16_t wRecvDataSz = 0; - if ((PHNCINFC_EXTNID_SIZE + PHNCINFC_EXTNSTATUS_SIZE) > - RspBuffInfo->wLen) { - android_errorWriteLog(0x534e4554, "181346550"); - return NFCSTATUS_FAILED; - } /* DataLen = TotalRecvdLen - (sizeof(RspId) + sizeof(Status)) */ wPldDataSize = ((RspBuffInfo->wLen) - (PHNCINFC_EXTNID_SIZE + PHNCINFC_EXTNSTATUS_SIZE)); |