| commit | 24df2bc3932c85a381d05ae5b82c0ef1774b83e1 | [log] [tgz] |
|---|---|---|
| author | Alisher Alikhodjaev <alisher@google.com> | Thu Mar 31 18:01:36 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 31 18:01:36 2022 +0000 |
| tree | dd1f0e1ef0e4f18afccd05268b8a862727a10767 | |
| parent | e135957367d88172c3e943946c8412381ca4f2e3 [diff] | |
| parent | 275a1196454f1cf092cbdd6bc9cd6f0d59b3d2db [diff] |
Merge "OOBR in nfc_ncif_proc_ee_discover_req()" into qt-dev am: 275a119645 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/nfc/+/17310817 Change-Id: Idb30c6f30d4a44171ab4cbe23ed6e4b1f056b724 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc index f14e6f2..266ad90 100644 --- a/src/nfc/nfc/nfc_ncif.cc +++ b/src/nfc/nfc/nfc_ncif.cc
@@ -1256,6 +1256,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";