Skip to content

Commit cb8e65e

Browse files
committed
Fix unexpected growing of internal buffers up to max size when parsing from java.io.InputStream and java.nio.DirectByteBuffer
1 parent 123e925 commit cb8e65e

File tree

2 files changed

+2
-6
lines changed
  • jsoniter-scala-core
    • js/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core
    • jvm-native/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core

2 files changed

+2
-6
lines changed

jsoniter-scala-core/js/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4051,9 +4051,7 @@ final class JsonReader private[jsoniter_scala](
40514051
if (mark > 0) mark = 0
40524052
tail = remaining
40534053
head = newPos
4054-
} else {
4055-
if (tail > 0) growBuf()
4056-
}
4054+
} else if (buf.length == tail) growBuf()
40574055
var len = buf.length - tail
40584056
if (bbuf ne null) {
40594057
len = Math.min(bbuf.remaining, len)

jsoniter-scala-core/jvm-native/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4506,9 +4506,7 @@ final class JsonReader private[jsoniter_scala](
45064506
if (mark > 0) mark = 0
45074507
tail = remaining
45084508
head = newPos
4509-
} else {
4510-
if (tail > 0) growBuf()
4511-
}
4509+
} else if (buf.length == tail) growBuf()
45124510
var len = buf.length - tail
45134511
if (bbuf ne null) {
45144512
len = Math.min(bbuf.remaining, len)

0 commit comments

Comments
 (0)