Fix BufferedInputStream.read() for values bigger than 0x7f (scala-nat…

…ive#1922) `read()` should return a value between `-1` and `255` and `-1` means `EOF`.
ekrich · May 21, 2021 · 06651cd · 06651cd
1 parent 479d717
commit 06651cd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/javalib/src/main/scala/java/io/BufferedInputStream.scala b/javalib/src/main/scala/java/io/BufferedInputStream.scala
@@ -61,7 +61,7 @@ class BufferedInputStream(_in: InputStream, size: Int)
     ensureOpen()
 
     if (prepareRead()) {
-      val res = buf(pos).toInt
+      val res = buf(pos).toInt & 0xff
       pos += 1
       res
     } else -1

diff --git a/unit-tests/src/test/scala/java/io/BufferedInputStreamSuite.scala b/unit-tests/src/test/scala/java/io/BufferedInputStreamSuite.scala
@@ -38,6 +38,17 @@ object BufferedInputStreamSuite extends tests.Suite {
 
   }
 
+  test("read value bigger than 0x7f") {
+    val inputArray = Array[Byte](0x85.toByte)
+
+    val arrayIn = new ByteArrayInputStream(inputArray)
+
+    val in = new BufferedInputStream(arrayIn)
+
+    assert(in.read() == 0x85)
+    assert(in.read() == -1)
+  }
+
   test("read to closed buffer throws IOException") {
 
     val inputArray =