commit 4d308574a302d08c2fcb0244918270ac91623d1e
author Ruchi Kandoi <kandoiruchi@google.com> Tue Nov 06 16:16:17 2018 -0800
committer JP Sugarbroad <jpsugar@google.com> Mon Jan 14 16:44:25 2019 -0800
tree f0103176bf56a17834a759de566a5648d0637766
parent 8d07fd248e7dc6432e7d0a93e50c779a008afa94

Prevent Out of bound error in llcp_dlc_proc_rr_rnr_pdu()

Test: Nfc Enable/disable
Bug: 116788646
Change-Id: Iefa9ca0a291e0c59a442befccfaa2f17eecd461e
(cherry picked from commit 007bc12c4bec59e2ec31d03248e386dd6937ffd1)

src/nfc/llcp/llcp_dlc.cc

diff --git a/src/nfc/llcp/llcp_dlc.cc b/src/nfc/llcp/llcp_dlc.cc
index 7f06e36..22fd548 100644
--- a/src/nfc/llcp/llcp_dlc.cc
+++ b/src/nfc/llcp/llcp_dlc.cc
@@ -1071,6 +1071,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) {