commit bc4fb4258f31bc6ba2afa91aaaa8da48299119e2
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 08 00:12:49 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 08 00:12:49 2022 +0000
tree f9648e06386028e99a17377d1bb67be31a1b4c82
parent 75cd1666856ed46927c5c66dfc022a887e74044b
parent bc35236f0ac4525256d46e07fcfc04ce8383b02c

Merge cherrypicks of [17310817] into tm-qpr1-release.

Change-Id: I977c3435b758981a6fcde5532fde54a3e21c9cbe

src/nfc/nfc/nfc_ncif.cc

diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index 47d00de..abffe82 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -1482,6 +1482,11 @@
   DLOG_IF(INFO, nfc_debug_enabled)
       << StringPrintf("nfc_ncif_proc_ee_discover_req %d len:%d", *p, plen);
 
+  if (!plen) {
+    android_errorWriteLog(0x534e4554, "221856662");
+    return;
+  }
+
   if (*p > NFC_MAX_EE_DISC_ENTRIES) {
     android_errorWriteLog(0x534e4554, "122361874");
     LOG(ERROR) << __func__ << "Exceed NFC_MAX_EE_DISC_ENTRIES";