From 9972246d71a3d0aeb4dfb9423c64befbabff3a83 Mon Sep 17 00:00:00 2001
From: Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>
Date: Sun, 3 Jul 2022 18:30:35 +0400
Subject: Fixed crashes

---
 app/build.gradle                                                      | 4 ++--
 .../java/com/clusterrr/usbserialtelnetserver/TcpClientThread.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d6854c1..2a76a8c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.clusterrr.usbserialtelnetserver"
         minSdk 19
         targetSdk 32
-        versionCode 6
-        versionName "1.3"
+        versionCode 7
+        versionName "1.4"
     }
 
     buildTypes {
diff --git a/app/src/main/java/com/clusterrr/usbserialtelnetserver/TcpClientThread.java b/app/src/main/java/com/clusterrr/usbserialtelnetserver/TcpClientThread.java
index 976b8b1..130a44d 100644
--- a/app/src/main/java/com/clusterrr/usbserialtelnetserver/TcpClientThread.java
+++ b/app/src/main/java/com/clusterrr/usbserialtelnetserver/TcpClientThread.java
@@ -93,7 +93,7 @@ public class TcpClientThread extends Thread {
                 continue;
             }
             if (b == (byte)0xFF) {
-                if (i >= len) break;
+                if (i + 1 >= len) break;
                 byte next = mBuffer.get(i + 1);
                 if (next == (byte)0xFF) {
                     // just 0xFF
@@ -103,7 +103,7 @@ public class TcpClientThread extends Thread {
                     continue;
                 }
                 // Command
-                if (i + 1 >= len) break;
+                if (i + 2 >= len) break;
                 byte cmd = next;
                 byte opt = mBuffer.get(i + 2);
                 Log.d(UsbSerialTelnetService.TAG, "Telnet command: CMD=" + (cmd >= 0 ? cmd : cmd + 256) + " ARG=" + (opt >= 0 ? opt : opt + 256));
-- 
cgit v1.2.3