Fix ByteIterator#indexWhere (#1285)

JD557 · web-flow · commit 92d3f83c9584 · 2024-04-16T18:27:01.000+08:00
It would blow up when from was out of bounds.
diff --git a/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala
@@ -922,6 +922,11 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers {
           likeVector(a) { _.indexWhere(_ == b) }
         }
       }
+      "calling indexWhere(p, idx)" in {
+        check { (a: ByteString, b: Byte, idx: Int) =>
+          likeVector(a) { _.indexWhere(_ == b, math.max(0, idx)) }
+        }
+      }
       "calling indexOf" in {
         check { (a: ByteString, b: Byte) =>
           likeVector(a) { _.indexOf(b) }
diff --git a/actor/src/main/scala-2.12/org/apache/pekko/util/ByteIterator.scala b/actor/src/main/scala-2.12/org/apache/pekko/util/ByteIterator.scala
@@ -470,7 +470,7 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
   override def indexWhere(p: Byte => Boolean): Int = indexWhere(p, 0)
   override def indexWhere(p: Byte => Boolean, from: Int): Int = {
     var index = 0
-    while (index < from) {
+    while (index < from && hasNext) {
       next()
       index += 1
     }
diff --git a/actor/src/main/scala-2.13/org/apache/pekko/util/ByteIterator.scala b/actor/src/main/scala-2.13/org/apache/pekko/util/ByteIterator.scala
@@ -486,7 +486,7 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
 
   override def indexWhere(p: Byte => Boolean, from: Int = 0): Int = {
     var index = 0
-    while (index < from) {
+    while (index < from && hasNext) {
       next()
       index += 1
     }
diff --git a/actor/src/main/scala-3/org/apache/pekko/util/ByteIterator.scala b/actor/src/main/scala-3/org/apache/pekko/util/ByteIterator.scala
@@ -482,7 +482,7 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
 
   override def indexWhere(p: Byte => Boolean, from: Int = 0): Int = {
     var index = 0
-    while (index < from) {
+    while (index < from && hasNext) {
       next()
       index += 1
     }

Original file line number	Diff line number	Diff line change
`@@ -922,6 +922,11 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers {`
`922`	`922`	`likeVector(a) { _.indexWhere(_ == b) }`
`923`	`923`	`}`
`924`	`924`	`}`
	`925`	`+ "calling indexWhere(p, idx)" in {`
	`926`	`+ check { (a: ByteString, b: Byte, idx: Int) =>`
	`927`	`+ likeVector(a) { _.indexWhere(_ == b, math.max(0, idx)) }`
	`928`	`+ }`
	`929`	`+ }`
`925`	`930`	`"calling indexOf" in {`
`926`	`931`	`check { (a: ByteString, b: Byte) =>`
`927`	`932`	`likeVector(a) { _.indexOf(b) }`
Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ abstract class ByteIterator extends BufferedIterator[Byte] {`
`470`	`470`	`override def indexWhere(p: Byte => Boolean): Int = indexWhere(p, 0)`
`471`	`471`	`override def indexWhere(p: Byte => Boolean, from: Int): Int = {`
`472`	`472`	`var index = 0`
`473`		`- while (index < from) {`
	`473`	`+ while (index < from && hasNext) {`
`474`	`474`	`next()`
`475`	`475`	`index += 1`
`476`	`476`	`}`
Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ abstract class ByteIterator extends BufferedIterator[Byte] {`
`486`	`486`
`487`	`487`	`override def indexWhere(p: Byte => Boolean, from: Int = 0): Int = {`
`488`	`488`	`var index = 0`
`489`		`- while (index < from) {`
	`489`	`+ while (index < from && hasNext) {`
`490`	`490`	`next()`
`491`	`491`	`index += 1`
`492`	`492`	`}`
Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ abstract class ByteIterator extends BufferedIterator[Byte] {`
`482`	`482`
`483`	`483`	`override def indexWhere(p: Byte => Boolean, from: Int = 0): Int = {`
`484`	`484`	`var index = 0`
`485`		`- while (index < from) {`
	`485`	`+ while (index < from && hasNext) {`
`486`	`486`	`next()`
`487`	`487`	`index += 1`
`488`	`488`	`}`