summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlisher Alikhodjaev <alisher@google.com>2022-10-28 19:35:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-28 19:35:24 +0000
commitab8685f2cd1f14fd1f10cbd824750ee91d1bd637 (patch)
tree1dd61cfe3999c0fcac42381813cbcf02062a70fa
parentda58eba5009b7c0a7debe144ce1c86ae35ac261d (diff)
parentf5f24d0ea2bcc33f18915c4c7369f803c45e53b0 (diff)
downloadNfc-ab8685f2cd1f14fd1f10cbd824750ee91d1bd637.tar.gz
DO NOT MERGE OOBW in Mfc_Transceive() am: f5f24d0ea2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/20293734 Change-Id: I369b46f92b48272cf61ce3f35d4574a04afc5351 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
index a54f2c89..9bc4d064 100644
--- a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
+++ b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
@@ -994,6 +994,11 @@ NFCSTATUS Mfc_Transceive(uint8_t* p_data, uint32_t len) {
return status;
}
+ if (len > (MAX_BUFF_SIZE * 2)) {
+ android_errorWriteLog(0x534e4554, "241387741");
+ return status;
+ }
+
gphNxpExtns_Context.RawWriteCallBack = false;
gphNxpExtns_Context.CallBackMifare = NULL;
gphNxpExtns_Context.CallBackCtxt = NdefMap;