From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 7 Oct 2015 18:40:45 +0000 (+0200)
Subject: monitor: Fix array boundary issue with version information
X-Git-Tag: android-x86-6.0-r1~366
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=051902a0a63c1c9c78cc097ad66caf73453f0baa;p=android-x86%2Fexternal-bluetooth-bluez.git

monitor: Fix array boundary issue with version information
---

diff --git a/monitor/packet.c b/monitor/packet.c
index 687fcbd93..61e33eb9b 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -5501,13 +5501,15 @@ static void read_local_version_rsp(const void *data, uint8_t size)
 	print_status(rsp->status);
 	print_hci_version(rsp->hci_ver, rsp->hci_rev);
 
-	switch (index_list[index_current].type) {
-	case HCI_BREDR:
-		print_lmp_version(rsp->lmp_ver, rsp->lmp_subver);
-		break;
-	case HCI_AMP:
-		print_pal_version(rsp->lmp_ver, rsp->lmp_subver);
-		break;
+	if (index_current < MAX_INDEX) {
+		switch (index_list[index_current].type) {
+		case HCI_BREDR:
+			print_lmp_version(rsp->lmp_ver, rsp->lmp_subver);
+			break;
+		case HCI_AMP:
+			print_pal_version(rsp->lmp_ver, rsp->lmp_subver);
+			break;
+		}
 	}
 
 	print_manufacturer(rsp->manufacturer);