commit 1c6ab25b3d76c2ced764dc649bec6cf05aecd198
author Alisher Alikhodjaev <alisher@google.com> Mon Mar 21 19:31:28 2022 -0700
committer Alisher Alikhodjaev <alisher@google.com> Mon Mar 21 19:31:28 2022 -0700
tree deddae25142daed103e801b0b6b5e5796c003a22
parent 516737f8f3c71d48157c837e535d89f149063ea6

OOBR in nfc_ncif_proc_ee_discover_req()

Bug: 221856662
Test: build ok
Change-Id: If4b4872e4101fc65172596b4f7579b259b6f6b63

src/nfc/nfc/nfc_ncif.cc

diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index 0322a97..464fb51 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -1238,6 +1238,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";