stop crashing in BufferedSocketInputStream#read

osheroff · osheroff · commit 324858397ec1 · 2022-04-14T22:20:12.000-07:00
diff --git a/src/main/java/com/github/shyiko/mysql/binlog/io/BufferedSocketInputStream.java b/src/main/java/com/github/shyiko/mysql/binlog/io/BufferedSocketInputStream.java
@@ -60,6 +60,10 @@ public int read(byte[] b, int off, int len) throws IOException {
             }
             offset = 0;
             limit = in.read(buffer, 0, buffer.length);
+            
+            if (limit == -1) {
+                return -1;
+            }
         }
         int bytesRemainingInBuffer = Math.min(len, limit - offset);
         System.arraycopy(buffer, offset, b, off, bytesRemainingInBuffer);

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,10 @@ public int read(byte[] b, int off, int len) throws IOException {`
`60`	`60`	`}`
`61`	`61`	`offset = 0;`
`62`	`62`	`limit = in.read(buffer, 0, buffer.length);`
	`63`	`+`
	`64`	`+ if (limit == -1) {`
	`65`	`+ return -1;`
	`66`	`+ }`
`63`	`67`	`}`
`64`	`68`	`int bytesRemainingInBuffer = Math.min(len, limit - offset);`
`65`	`69`	`System.arraycopy(buffer, offset, b, off, bytesRemainingInBuffer);`