commit 85508b60cff84595ed05dae2edaef1c9bfd6d5e9
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 08 00:41:18 2021 -0700
committer Linux Build Service Account <lnxbuild@localhost> Thu Apr 08 00:41:18 2021 -0700
tree 6c1396b55c5d0eabbaaf9e6ce585d196d7fd5f1a
parent aa79f23cfebcf12666260cb07049a548ebfb4e4b
parent e0698f362cf6fef74f2504e63b8844dedce85275

Merge e0698f362cf6fef74f2504e63b8844dedce85275 on remote branch

Change-Id: I1d0be296949a260c7c0dd35fea92d7706a089cee

src/nfc/nci/nci_hrcv.cc

diff --git a/src/nfc/nci/nci_hrcv.cc b/src/nfc/nci/nci_hrcv.cc
index 9329771..7dfa408 100644
--- a/src/nfc/nci/nci_hrcv.cc
+++ b/src/nfc/nci/nci_hrcv.cc
@@ -26,6 +26,7 @@
 
 #include <android-base/stringprintf.h>
 #include <base/logging.h>
+#include <log/log.h>
 
 #include "nfc_target.h"
 
@@ -252,6 +253,11 @@
       break;
 
     case NCI_MSG_RF_DEACTIVATE:
+      if (p_msg->len < 5) {
+        /* NCI_HEADER(3) + Deactivation Type(1) + Deactivation Reason(1) */
+        android_errorWriteLog(0x534e4554, "164440989");
+        return;
+      }
       if (nfa_dm_p2p_prio_logic(op_code, pp, NFA_DM_P2P_PRIO_NTF) == false) {
         return;
       }