Throwing EOF from BytesStreamInput if read too much

Signed-off-by: Gaurav Bafna <[email protected]>
opensearch-project · Dec 23, 2022 · 38f3a41 · 38f3a41
1 parent ea33f76
commit 38f3a41
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/server/src/main/java/org/opensearch/common/io/stream/BytesStreamInput.java b/server/src/main/java/org/opensearch/common/io/stream/BytesStreamInput.java
@@ -80,15 +80,19 @@ public void skipBytes(long count) {
         pos += count;
     }
 
-    // NOTE: AIOOBE not EOF if you read too much
     @Override
-    public byte readByte() {
+    public byte readByte() throws EOFException {
+        if (eof()) {
+            throw new EOFException();
+        }
         return bytes[pos++];
     }
 
-    // NOTE: AIOOBE not EOF if you read too much
     @Override
-    public void readBytes(byte[] b, int offset, int len) {
+    public void readBytes(byte[] b, int offset, int len) throws EOFException {
+        if (available() < len) {
+            throw new EOFException();
+        }
         System.arraycopy(bytes, pos, b, offset, len);
         pos += len;
     }
@@ -111,6 +115,9 @@ protected void ensureCanReadBytes(int length) throws EOFException {
 
     @Override
     public int read() throws IOException {
+        if (eof()) {
+            throw new EOFException();
+        }
         return bytes[pos++] & 0xFF;
     }
 

diff --git a/server/src/main/java/org/opensearch/index/translog/BufferedChecksumStreamInput.java b/server/src/main/java/org/opensearch/index/translog/BufferedChecksumStreamInput.java
@@ -120,7 +120,7 @@ public void reset() throws IOException {
     public int read() throws IOException {
         try {
             return readByte() & 0xFF;
-        } catch (EOFException | ArrayIndexOutOfBoundsException e) {
+        } catch (EOFException e) {
             return -1;
         }
     }