micropeak: Use new 'last logdir' preference for MicroPeak save/load dialogs

[fw/altos] / altosui / AltosDebug.java

diff --git a/altosui/AltosDebug.java b/altosui/AltosDebug.java
index d18de80d09d36e0fe9d84f0652f79bbdbd533d5a..c69369ef26a10683da2f6324642d6db1c6b09681 100644 (file)
--- a/altosui/AltosDebug.java
+++ b/altosui/AltosDebug.java
@@ -17,12 +17,8 @@
 
 package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.util.concurrent.*;
-import java.util.*;
-
-import libaltosJNI.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosDebug extends AltosSerial {
 
@@ -163,7 +159,11 @@ public class AltosDebug extends AltosSerial {
                int i = 0;
                byte[] data = new byte[length];
                while (i < length) {
-                       String line = get_reply().trim();
+                       String line = get_reply();
+
+                       if (line == null)
+                               throw new IOException("Timeout in read_bytes");
+                       line = line.trim();
                        String tokens[] = line.split("\\s+");
                        for (int j = 0; j < tokens.length; j++) {
                                if (!Altos.ishex(tokens[j]) ||
@@ -172,7 +172,12 @@ public class AltosDebug extends AltosSerial {
                                                String.format
                                                ("Invalid read_bytes reply \"%s\"", line));
                                try {
-                                       data[i + j] = (byte) Integer.parseInt(tokens[j], 16);
+                                       if (i + j >= length)
+                                               throw new IOException(
+                                                       String.format
+                                                       ("Invalid read_bytes reply \"%s\"", line));
+                                       else
+                                               data[i + j] = (byte) Integer.parseInt(tokens[j], 16);
                                } catch (NumberFormatException ne) {
                                        throw new IOException(
                                                String.format