commit afaadd92efb8be4c338a5c1f743a13b6c2bca916
author android-build-team Robot <android-build-team-robot@google.com> Wed Dec 23 00:08:40 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Dec 23 00:08:40 2020 +0000
tree f8d3f062f9da61fec580ecbf8f7254d53437153f
parent b3a413395fc017be496a9a25057079d63a24ba1c
parent 4c38779e3c931cc96c56a0d491eb44b866029fb2

Snap for 7046226 from 4c38779e3c931cc96c56a0d491eb44b866029fb2 to rvc-qpr2-release

Change-Id: Ic748564cbe06fc8eabf6c74db97098ce122a9978

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;