Merge branch 'dev/10/fp2/security-aosp-qt-release' into int/10/fp2
* dev/10/fp2/security-aosp-qt-release:
The length of a packet should be non-zero
Change-Id: Ia4743ca82115c226ac37320a08b0eaff785c033a
diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index 266ad90..60cca32 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -1253,14 +1253,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";