The length of a packet should be non-zero
Bug: 221856662
Bug: 237079835
Test: no functional changes, the build is ok
Issue: FP3SEC-402
Change-Id: I6defe4025c962ae7dde2e673e2bfcfc15785cc12
(cherry picked from commit 396ac0e081ae67a1d743e0373257ec869692912c)
Merged-In: I6defe4025c962ae7dde2e673e2bfcfc15785cc12
[Port to NXP: Apply to SN100x as well.]
(cherry picked from commit 3ff2107638ef13989fda8155798c3f4d952b86ba)
diff --git a/SN100x/src/nfc/nfc/nfc_ncif.cc b/SN100x/src/nfc/nfc/nfc_ncif.cc
index 99e8494..3b38b57 100644
--- a/SN100x/src/nfc/nfc/nfc_ncif.cc
+++ b/SN100x/src/nfc/nfc/nfc_ncif.cc
@@ -1702,14 +1702,14 @@
tNFC_EE_DISCOVER_INFO* p_info;
uint8_t u8;
- 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;
}
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("nfc_ncif_proc_ee_discover_req %d len:%d", *p, plen);
+
if (*p > NFC_MAX_EE_DISC_ENTRIES) {
android_errorWriteLog(0x534e4554, "122361874");
LOG(ERROR) << __func__ << "Exceed NFC_MAX_EE_DISC_ENTRIES";
diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index d11ff61..c60f703 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -2221,13 +2221,14 @@
tNFC_EE_DISCOVER_INFO* p_info;
uint8_t u8;
- 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;
}
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("nfc_ncif_proc_ee_discover_req %d len:%d", *p, plen);
+
if (*p > NFC_MAX_EE_DISC_ENTRIES) {
android_errorWriteLog(0x534e4554, "122361874");
LOG(ERROR) << __func__ << "Exceed NFC_MAX_EE_DISC_ENTRIES";