commit 007bc12c4bec59e2ec31d03248e386dd6937ffd1
author Ruchi Kandoi <kandoiruchi@google.com> Tue Nov 06 16:16:17 2018 -0800
committer Ruchi Kandoi <kandoiruchi@google.com> Tue Nov 06 16:18:05 2018 -0800
tree 379fd00159c8d6156419029a436dfc542a62a5fc
parent 40b35a607a0fb122f51f1f9dd7b1e60c4bb8541f

Prevent Out of bound error in llcp_dlc_proc_rr_rnr_pdu()

Test: Nfc Enable/disable
Bug: 116788646
Change-Id: Iefa9ca0a291e0c59a442befccfaa2f17eecd461e

src/nfc/llcp/llcp_dlc.c

diff --git a/src/nfc/llcp/llcp_dlc.c b/src/nfc/llcp/llcp_dlc.c
index 06d0250..462aeb6 100644
--- a/src/nfc/llcp/llcp_dlc.c
+++ b/src/nfc/llcp/llcp_dlc.c
@@ -1074,6 +1074,10 @@
   if (p_dlcb != NULL) {
     error_flags = 0;
 
+    if (length == 0) {
+      android_errorWriteLog(0x534e4554, "116788646");
+      return;
+    }
     rcv_seq = LLCP_GET_NR(*p_data);
 
     if (length != LLCP_PDU_RR_SIZE - LLCP_PDU_HEADER_SIZE) {