Fixed potential array out of bounds exception, and an issue where we …

…would not read the entire server response
solita · Aug 9, 2019 · 0ba6abe · 0ba6abe
1 parent 4ff23d3
commit 0ba6abe
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/fi/solita/clamav/ClamAVClient.java b/src/main/java/fi/solita/clamav/ClamAVClient.java
@@ -154,10 +154,9 @@ private static byte[] readAll(InputStream is) throws IOException {
 
     byte[] buf = new byte[2000];
     int read = 0;
-    do {
-      read = is.read(buf);
-      tmp.write(buf, 0, read);
-    } while ((read > 0) && (is.available() > 0));
+    while ((read = is.read(buf)) != -1) {
+        tmp.write(buf, 0, read);
+    }
     return tmp.toByteArray();
   }
 }