Properly compute the safe read limit when multiplying by 4.

Netflix · May 9, 2018 · f63fc6d · f63fc6d
1 parent b0fdc65
commit f63fc6d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/java/com/netflix/msl/io/ThriftyUtf8Reader.java b/core/src/main/java/com/netflix/msl/io/ThriftyUtf8Reader.java
@@ -490,7 +490,8 @@ public void mark(final int readLimit) throws IOException {
         // This is complicated because the read limit is in characters but the
         // backing input stream is in bytes. If we really want to be safe then
         // we need to multiply by 4 bytes. Account for overflow.
-        final int safeLimit = Math.max(Integer.MAX_VALUE, 4 * readLimit);
+        final int byteLimit = 4 * readLimit;
+        final int safeLimit = (byteLimit < 0) ? Integer.MAX_VALUE : byteLimit;
         fInputStream.mark(safeLimit);
     }