altoslib: Fix data fetching during flashing of cc1111-based devices

[fw/altos] / altoslib / AltosHexfile.java

diff --git a/altoslib/AltosHexfile.java b/altoslib/AltosHexfile.java
index 6aa98383e9fc38d92d93b928a97d4990c6fc8258..f2ab4bead5c3883dd8cd1e16d5020b8cf63eb484 100644 (file)
--- 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() {