fix: throw on not enough bytes (#288)

Signed-off-by: Lazar Petrovic <lpetrovic05@gmail.com>
hashgraph · Sep 18, 2024 · aa12028 · aa12028
1 parent bd40ceb
commit aa12028
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/pbj-core/pbj-runtime/src/main/java/com/hedera/pbj/runtime/io/ReadableSequentialData.java b/pbj-core/pbj-runtime/src/main/java/com/hedera/pbj/runtime/io/ReadableSequentialData.java
@@ -214,7 +214,10 @@ default long readBytes(@NonNull final BufferedData dst) throws UncheckedIOExcept
         }
 
         final var bytes = new byte[length];
-        readBytes(bytes, 0, length);
+        final long bytesRead = readBytes(bytes, 0, length);
+        if (bytesRead != length) {
+            throw new BufferUnderflowException();
+        }
         return Bytes.wrap(bytes);
     }
 

diff --git a/pbj-core/pbj-runtime/src/test/java/com/hedera/pbj/runtime/ProtoParserToolsTest.java b/pbj-core/pbj-runtime/src/test/java/com/hedera/pbj/runtime/ProtoParserToolsTest.java
@@ -250,8 +250,10 @@ void testReadBytes_incomplete() throws IOException {
         final byte[] bytes = data.toInputStream().readAllBytes();
         final byte[] incompleteCopy = new byte[bytes.length - 1];
         System.arraycopy(bytes, 0, incompleteCopy, 0, bytes.length - 1);
-        final ReadableStreamingData streamingData = new ReadableStreamingData(new ByteArrayInputStream(incompleteCopy));
-        assertThrows(BufferUnderflowException.class, () -> ProtoParserTools.readString(streamingData));
+        assertThrows(BufferUnderflowException.class,
+                () -> ProtoParserTools.readString(new ReadableStreamingData(new ByteArrayInputStream(incompleteCopy))));
+        assertThrows(BufferUnderflowException.class,
+                () -> ProtoParserTools.readBytes(new ReadableStreamingData(new ByteArrayInputStream(incompleteCopy))));
     }