Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3
* dev/11/fp3/security-aosp-rvc-release:
The length of a packet should be non-zero
Change-Id: I89ff79a00388d594a21707d1082564bf427be476
diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index e470386..93a3509 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -1508,14 +1508,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";