Merge branch 'master' into branch-1.8

1 files changed, 12 insertions, 8 deletions

diff --git a/altoslib/AltosHexfile.java b/altoslib/AltosHexfile.java
index 6aa98383..f2ab4bea 100644
--- a/altoslib/AltosHexfile.java
+++ b/altoslib/AltosHexfile.java
@@ -294,15 +294,19 @@ public class AltosHexfile {
 		if (usb_descriptors == null)
 			return -1;
 
-		/* Walk the descriptors looking for the device */
-		a = usb_descriptors.address;
-		while (get_u8(a+1) != AO_USB_DESC_DEVICE) {
-			int delta = get_u8(a);
-			a += delta;
-			if (delta == 0 || a >= max_address)
-				return -1;
+		try {
+			/* Walk the descriptors looking for the device */
+			a = usb_descriptors.address;
+			while (get_u8(a+1) != AO_USB_DESC_DEVICE) {
+				int delta = get_u8(a);
+				a += delta;
+				if (delta == 0 || a >= max_address)
+					return -1;
+			}
+			return a;
+		} catch (ArrayIndexOutOfBoundsException ae) {
+			return -1;
 		}
-		return a;
 	}
 
 	public AltosUsbId find_usb_id() {