luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Expand json rpc request input buffer if needed 

When a json rpc request is specified without any headers, the size of
the message may exceed the buffer that was created for reading hdeaders.
This would cause an exception to be thrown when creating a string from
the header buffer because the number of bytes requested would exceed the
capacity of the buffer. To fix this, we can expand the buffer
dynamically if needed. For the common case when the headers are
specified, this should be a no-op.
This commit is contained in:
Ethan Atkins 2020-09-13 19:43:06 -07:00
parent 8053ebea73
commit 7b31495ae3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main-command/src/main/scala/sbt/internal/util/ReadJsonFromInputStream.scala
View File

@ -30,7 +30,12 @@ private[sbt] object ReadJsonFromInputStream {
* content-length, so this should be fine. If we ever start doing anything
* with headers, we may need to adjust this buffer size.
*/
val headerBuffer = new Array[Byte](128)
var headerBuffer = new Array[Byte](128)
def expandHeaderBuffer(): Unit = {
val newHeaderBuffer = new Array[Byte](headerBuffer.size * 2)
headerBuffer.view.zipWithIndex.foreach { case (b, i) => newHeaderBuffer(i) = b }
headerBuffer = newHeaderBuffer
}
def getLine(): String = {
val line = new String(headerBuffer, 0, index, "UTF-8")
index = 0
@ -61,7 +66,8 @@ private[sbt] object ReadJsonFromInputStream {
case c =>
if (c == newline) getLine()
else {
if (index < headerBuffer.length) headerBuffer(index) = c.toByte
if (index >= headerBuffer.length) expandHeaderBuffer()
headerBuffer(index) = c.toByte
index += 1
}
onCarriageReturn = false
@ -88,7 +94,8 @@ private[sbt] object ReadJsonFromInputStream {
case `carriageReturn` => onCarriageReturn = true
case c =>
onCarriageReturn = false
if (index < headerBuffer.length) headerBuffer(index) = c.toByte
if (index >= headerBuffer.length) expandHeaderBuffer()
headerBuffer(index) = c.toByte
index += 1
}