AVRO-4048: Ignore negative return values for InputStream skip

apache · Sep 1, 2024 · b130ffa · b130ffa
1 parent c7b79bf
commit b130ffa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 28 deletions.
diff --git a/lang/java/avro/src/main/java/org/apache/avro/io/BinaryDecoder.java b/lang/java/avro/src/main/java/org/apache/avro/io/BinaryDecoder.java
@@ -797,20 +797,12 @@ protected void skipSourceBytes(long length) throws IOException {
           continue;
         }
         // The inputStream contract is evil.
-        // zero "might" mean EOF. So check for 2 in a row, we will
-        // infinite loop waiting for -1 with some classes others
-        // spuriously will return 0 on occasion without EOF
-        if (n == 0) {
-          if (readZero) {
-            isEof = true;
-            throw new EOFException();
-          }
-          readZero = true;
-          continue;
+        // zero "might" mean EOF. So check for 2 in a row.
+        if (readZero) {
+          isEof = true;
+          throw new EOFException();
         }
-        // read negative
-        isEof = true;
-        throw new EOFException();
+        readZero = true;
       }
     }
 
@@ -826,21 +818,12 @@ protected long trySkipBytes(long length) throws IOException {
             continue;
           }
           // The inputStream contract is evil.
-          // zero "might" mean EOF. So check for 2 in a row, we will
-          // infinite loop waiting for -1 with some classes others
-          // spuriously will return 0 on occasion without EOF
-          if (n == 0) {
-            if (readZero) {
-              isEof = true;
-              break;
-            }
-            readZero = true;
-            continue;
+          // zero "might" mean EOF. So check for 2 in a row
+          if (readZero) {
+            isEof = true;
+            break;
           }
-          // read negative
-          isEof = true;
-          break;
-
+          readZero = true;
         }
       } catch (EOFException eof) {
         isEof = true;

diff --git a/lang/java/avro/src/main/java/org/apache/avro/io/DirectBinaryDecoder.java b/lang/java/avro/src/main/java/org/apache/avro/io/DirectBinaryDecoder.java
@@ -163,7 +163,7 @@ public ByteBuffer readBytes(ByteBuffer old) throws IOException {
   protected void doSkipBytes(long length) throws IOException {
     while (length > 0) {
       long n = in.skip(length);
-      if (n <= 0) {
+      if (n == 0) {
         throw new EOFException();
       }
       length -= n;