commit e19228fe3c58e58aa1a0911d819a8ddcac41fffa
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Wed Mar 17 10:04:12 2021 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Wed Mar 17 10:04:12 2021 +0000
tree f8d3f062f9da61fec580ecbf8f7254d53437153f
parent 17f0db5352b8d989c6f66f71dbe4e982f5b022dc
parent cb31398f72aec0f757ca9512dcf67546bb90e6f6

Snap for 7214043 from cb31398f72aec0f757ca9512dcf67546bb90e6f6 to r-keystone-qcom-release

Change-Id: If53f7996417302ad371e9e730097b27b5b770d03

halimpl/mifare/NxpMfcReader.cc

diff --git a/halimpl/mifare/NxpMfcReader.cc b/halimpl/mifare/NxpMfcReader.cc
index f4a1878..4b85955 100644
--- a/halimpl/mifare/NxpMfcReader.cc
+++ b/halimpl/mifare/NxpMfcReader.cc
@@ -15,6 +15,7 @@
  *  limitations under the License.
  *
  ******************************************************************************/
+#include <log/log.h>
 #include "NxpMfcReader.h"
 #include "phNxpNciHal.h"
 #include <phNfcCompId.h>
@@ -43,6 +44,10 @@
   uint16_t mfcTagCmdBuffLen = 0;
   uint8_t mfcTagCmdBuff[MAX_MFC_BUFF_SIZE] = {0};
 
+  if (mfcDataLen > MAX_MFC_BUFF_SIZE) {
+    android_errorWriteLog(0x534e4554, "169259605");
+    mfcDataLen = MAX_MFC_BUFF_SIZE;
+  }
   memcpy(mfcTagCmdBuff, pMfcData, mfcDataLen);
   if (mfcDataLen >= 3)
     mfcTagCmdBuffLen = mfcDataLen - NCI_HEADER_SIZE;