add safeByteChar

Author: pjfanning

http-core/src/main/scala-2.13/org/apache/pekko/http/impl/engine/package.scala

@@ -37,6 +37,14 @@ package object parsing {
     case x                              => x.toString
   }
 
+  /**
+    * Like `byteChar` but doesn't throw `NotEnoughDataException` if the index is out of bounds.
+    * Used in places where we know that the index is valid because we checked the length beforehand.
+    */
+  @inline
+  private[http] def safeByteChar(input: ByteString, ix: Int): Char =
+    (input(ix) & 0xFF).toChar
+
   @inline
   private[http] def byteChar(input: ByteString, ix: Int): Char = (byteAt(input, ix) & 0xFF).toChar
 

http-core/src/main/scala-3/org/apache/pekko/http/impl/engine/package.scala

@@ -36,6 +36,13 @@ package object parsing {
     case x                              => x.toString
   }
 
+  /**
+    * Like `byteChar` but doesn't throw `NotEnoughDataException` if the index is out of bounds.
+    * Used in places where we know that the index is valid because we checked the length beforehand.
+    */
+  private[http] inline def safeByteChar(input: ByteString, ix: Int): Char =
+    (input(ix) & 0xFF).toChar
+
   private[http] inline def byteChar(input: ByteString, ix: Int): Char = (byteAt(input, ix) & 0xFF).toChar
 
   private[http] inline def byteAt(input: ByteString, ix: Int): Byte =

http-core/src/main/scala/org/apache/pekko/http/impl/engine/parsing/HttpHeaderParser.scala

@@ -242,8 +242,8 @@ private[engine] final class HttpHeaderParser private (
   private def insert(input: ByteString, value: AnyRef)(cursor: Int = 0, endIx: Int = input.length, nodeIx: Int = 0,
       colonIx: Int = 0): Unit = {
     val char =
-      if (cursor < colonIx) toLowerCase(byteChar(input, cursor))
-      else if (cursor < endIx) byteChar(input, cursor)
+      if (cursor < colonIx) toLowerCase(safeByteChar(input, cursor))
+      else if (cursor < endIx) safeByteChar(input, cursor)
       else '\u0000'
     val node = nodes(nodeIx)
     if (char == node) insert(input, value)(cursor + 1, endIx, nodeIx + 1, colonIx) // fast match, descend into only subnode
@@ -290,7 +290,7 @@ private[engine] final class HttpHeaderParser private (
       endIx: Int = input.length, valueIx: Int = newValueIndex, colonIx: Int = 0): Unit = {
     val newNodeIx = newNodeIndex
     if (cursor < endIx) {
-      val c = byteChar(input, cursor)
+      val c = safeByteChar(input, cursor)
       val char = if (cursor < colonIx) toLowerCase(c) else c
       nodes(newNodeIx) = char
       insertRemainingCharsAsNewNodes(input, value)(cursor + 1, endIx, valueIx, colonIx)