commit 98a5e361f37eebf947c0deafbc9b9648982b25f4
author Ruchi Kandoi <kandoiruchi@google.com> Tue Nov 06 16:16:17 2018 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Fri Mar 15 23:10:19 2019 +0000
tree 2fdef66e18585da6616d5cb1f71dda3fae3fcaae
parent 2fde3566dcbec967d6b4d61fc1a1638923c45b11

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 59c3090aedd725f10e413fe7b38aff67a1782f1d)

src/nfc/llcp/llcp_dlc.c

diff --git a/src/nfc/llcp/llcp_dlc.c b/src/nfc/llcp/llcp_dlc.c
index bc4910e..9e7f7f1 100644
--- a/src/nfc/llcp/llcp_dlc.c
+++ b/src/nfc/llcp/llcp_dlc.c
@@ -1098,7 +1098,11 @@
     {
         error_flags = 0;
 
-        rcv_seq = LLCP_GET_NR (*p_data);
+        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)
         {