commit 3bb89d7ba73985a2304b3d9d5802c8fc1dbf4981
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 08 00:04:40 2021 -0700
committer Linux Build Service Account <lnxbuild@localhost> Thu Apr 08 00:04:40 2021 -0700
tree f8d3f062f9da61fec580ecbf8f7254d53437153f
parent 75884223f9e117dbc7b87fab46c9917ad601a438
parent e19228fe3c58e58aa1a0911d819a8ddcac41fffa

Merge e19228fe3c58e58aa1a0911d819a8ddcac41fffa on remote branch

Change-Id: I89f8effcbe022b2a800471f257b5518b010f0ab7

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;