azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure index and count do not overflow for long sequences

Browse Source 
Throw an exception immediately before an overflow becomes observable.
Place check to prevent negative index from indexOf, indexOfFirst.
Do not insert overflow checks for arrays, lists, maps and char sequences.

#KT-16097
This commit is contained in:
Ilya Gorbunov
2018-08-09 23:31:31 +03:00
parent c44f62a3d4
commit 357c5be4fb
16 changed files with 252 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/common/src/generated/_Arrays.kt
+21 -21
View File
@@ -9701,7 +9701,7 @@ public inline fun CharArray.count(): Int {
*/
public inline fun <T> Array<out T>.count(predicate: (T) -> Boolean): Int {
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) ++count
return count
}
@@ -9710,7 +9710,7 @@ public inline fun <T> Array<out T>.count(predicate: (T) -> Boolean): Int {
*/
public inline fun ByteArray.count(predicate: (Byte) -> Boolean): Int {
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) ++count
return count
}
@@ -9719,7 +9719,7 @@ public inline fun ByteArray.count(predicate: (Byte) -> Boolean): Int {
*/
public inline fun ShortArray.count(predicate: (Short) -> Boolean): Int {
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) ++count
return count
}
@@ -9728,7 +9728,7 @@ public inline fun ShortArray.count(predicate: (Short) -> Boolean): Int {
*/
public inline fun IntArray.count(predicate: (Int) -> Boolean): Int {
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) ++count
return count
}
@@ -9737,7 +9737,7 @@ public inline fun IntArray.count(predicate: (Int) -> Boolean): Int {
*/
public inline fun LongArray.count(predicate: (Long) -> Boolean): Int {
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) ++count
return count
}
@@ -9746,7 +9746,7 @@ public inline fun LongArray.count(predicate: (Long) -> Boolean): Int {
*/
public inline fun FloatArray.count(predicate: (Float) -> Boolean): Int {
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) ++count
return count
}
@@ -9755,7 +9755,7 @@ public inline fun FloatArray.count(predicate: (Float) -> Boolean): Int {
*/
public inline fun DoubleArray.count(predicate: (Double) -> Boolean): Int {
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) ++count
return count
}
@@ -9764,7 +9764,7 @@ public inline fun DoubleArray.count(predicate: (Double) -> Boolean): Int {
*/
public inline fun BooleanArray.count(predicate: (Boolean) -> Boolean): Int {
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) ++count
return count
}
@@ -9773,7 +9773,7 @@ public inline fun BooleanArray.count(predicate: (Boolean) -> Boolean): Int {
*/
public inline fun CharArray.count(predicate: (Char) -> Boolean): Int {
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) ++count
return count
}
@@ -13504,7 +13504,7 @@ public fun Array<out Byte>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
++count
}
return if (count == 0) Double.NaN else sum / count
}
@@ -13518,7 +13518,7 @@ public fun Array<out Short>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
++count
}
return if (count == 0) Double.NaN else sum / count
}
@@ -13532,7 +13532,7 @@ public fun Array<out Int>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
++count
}
return if (count == 0) Double.NaN else sum / count
}
@@ -13546,7 +13546,7 @@ public fun Array<out Long>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
++count
}
return if (count == 0) Double.NaN else sum / count
}
@@ -13560,7 +13560,7 @@ public fun Array<out Float>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
++count
}
return if (count == 0) Double.NaN else sum / count
}
@@ -13574,7 +13574,7 @@ public fun Array<out Double>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
++count
}
return if (count == 0) Double.NaN else sum / count
}
@@ -13587,7 +13587,7 @@ public fun ByteArray.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
++count
}
return if (count == 0) Double.NaN else sum / count
}
@@ -13600,7 +13600,7 @@ public fun ShortArray.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
++count
}
return if (count == 0) Double.NaN else sum / count
}
@@ -13613,7 +13613,7 @@ public fun IntArray.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
++count
}
return if (count == 0) Double.NaN else sum / count
}
@@ -13626,7 +13626,7 @@ public fun LongArray.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
++count
}
return if (count == 0) Double.NaN else sum / count
}
@@ -13639,7 +13639,7 @@ public fun FloatArray.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
++count
}
return if (count == 0) Double.NaN else sum / count
}
@@ -13652,7 +13652,7 @@ public fun DoubleArray.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
++count
}
return if (count == 0) Double.NaN else sum / count
}
libraries/stdlib/common/src/generated/_Collections.kt
+16 -12
View File
@@ -251,6 +251,7 @@ public fun <@kotlin.internal.OnlyInputTypes T> Iterable<T>.indexOf(element: T):
if (this is List) return this.indexOf(element)
var index = 0
for (item in this) {
checkIndexOverflow(index)
if (element == item)
return index
index++
@@ -272,6 +273,7 @@ public fun <@kotlin.internal.OnlyInputTypes T> List<T>.indexOf(element: T): Int
public inline fun <T> Iterable<T>.indexOfFirst(predicate: (T) -> Boolean): Int {
var index = 0
for (item in this) {
checkIndexOverflow(index)
if (predicate(item))
return index
index++
@@ -299,6 +301,7 @@ public inline fun <T> Iterable<T>.indexOfLast(predicate: (T) -> Boolean): Int {
var lastIndex = -1
var index = 0
for (item in this) {
checkIndexOverflow(index)
if (predicate(item))
lastIndex = index
index++
@@ -387,6 +390,7 @@ public fun <@kotlin.internal.OnlyInputTypes T> Iterable<T>.lastIndexOf(element:
var lastIndex = -1
var index = 0
for (item in this) {
checkIndexOverflow(index)
if (element == item)
lastIndex = index
index++
@@ -1258,7 +1262,7 @@ public inline fun <T, R : Any, C : MutableCollection<in R>> Iterable<T>.mapIndex
public inline fun <T, R, C : MutableCollection<in R>> Iterable<T>.mapIndexedTo(destination: C, transform: (index: Int, T) -> R): C {
var index = 0
for (item in this)
destination.add(transform(index++, item))
destination.add(transform(checkIndexOverflow(index++), item))
return destination
}
@@ -1407,7 +1411,7 @@ public inline fun <T> Iterable<T>.any(predicate: (T) -> Boolean): Boolean {
public fun <T> Iterable<T>.count(): Int {
if (this is Collection) return size
var count = 0
for (element in this) count++
for (element in this) checkCountOverflow(++count)
return count
}
@@ -1425,7 +1429,7 @@ public inline fun <T> Collection<T>.count(): Int {
public inline fun <T> Iterable<T>.count(predicate: (T) -> Boolean): Int {
if (this is Collection && isEmpty()) return 0
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) checkCountOverflow(++count)
return count
}
@@ -1447,7 +1451,7 @@ public inline fun <T, R> Iterable<T>.fold(initial: R, operation: (acc: R, T) ->
public inline fun <T, R> Iterable<T>.foldIndexed(initial: R, operation: (index: Int, acc: R, T) -> R): R {
var index = 0
var accumulator = initial
for (element in this) accumulator = operation(index++, accumulator, element)
for (element in this) accumulator = operation(checkIndexOverflow(index++), accumulator, element)
return accumulator
}
@@ -1498,7 +1502,7 @@ public inline fun <T> Iterable<T>.forEach(action: (T) -> Unit): Unit {
*/
public inline fun <T> Iterable<T>.forEachIndexed(action: (index: Int, T) -> Unit): Unit {
var index = 0
for (item in this) action(index++, item)
for (item in this) action(checkIndexOverflow(index++), item)
}
/**
@@ -1725,7 +1729,7 @@ public inline fun <S, T : S> Iterable<T>.reduceIndexed(operation: (index: Int, a
var index = 1
var accumulator: S = iterator.next()
while (iterator.hasNext()) {
accumulator = operation(index++, accumulator, iterator.next())
accumulator = operation(checkIndexOverflow(index++), accumulator, iterator.next())
}
return accumulator
}
@@ -2238,7 +2242,7 @@ public fun Iterable<Byte>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
checkCountOverflow(++count)
}
return if (count == 0) Double.NaN else sum / count
}
@@ -2252,7 +2256,7 @@ public fun Iterable<Short>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
checkCountOverflow(++count)
}
return if (count == 0) Double.NaN else sum / count
}
@@ -2266,7 +2270,7 @@ public fun Iterable<Int>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
checkCountOverflow(++count)
}
return if (count == 0) Double.NaN else sum / count
}
@@ -2280,7 +2284,7 @@ public fun Iterable<Long>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
checkCountOverflow(++count)
}
return if (count == 0) Double.NaN else sum / count
}
@@ -2294,7 +2298,7 @@ public fun Iterable<Float>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
checkCountOverflow(++count)
}
return if (count == 0) Double.NaN else sum / count
}
@@ -2308,7 +2312,7 @@ public fun Iterable<Double>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
checkCountOverflow(++count)
}
return if (count == 0) Double.NaN else sum / count
}
libraries/stdlib/common/src/generated/_Maps.kt
+1 -1
View File
@@ -135,7 +135,7 @@ public inline fun <K, V> Map<out K, V>.count(): Int {
public inline fun <K, V> Map<out K, V>.count(predicate: (Map.Entry<K, V>) -> Boolean): Int {
if (isEmpty()) return 0
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) ++count
return count
}
libraries/stdlib/common/src/generated/_Sequences.kt
+16 -12
View File
@@ -146,6 +146,7 @@ public inline fun <T> Sequence<T>.firstOrNull(predicate: (T) -> Boolean): T? {
public fun <@kotlin.internal.OnlyInputTypes T> Sequence<T>.indexOf(element: T): Int {
var index = 0
for (item in this) {
checkIndexOverflow(index)
if (element == item)
return index
index++
@@ -161,6 +162,7 @@ public fun <@kotlin.internal.OnlyInputTypes T> Sequence<T>.indexOf(element: T):
public inline fun <T> Sequence<T>.indexOfFirst(predicate: (T) -> Boolean): Int {
var index = 0
for (item in this) {
checkIndexOverflow(index)
if (predicate(item))
return index
index++
@@ -177,6 +179,7 @@ public inline fun <T> Sequence<T>.indexOfLast(predicate: (T) -> Boolean): Int {
var lastIndex = -1
var index = 0
for (item in this) {
checkIndexOverflow(index)
if (predicate(item))
lastIndex = index
index++
@@ -229,6 +232,7 @@ public fun <@kotlin.internal.OnlyInputTypes T> Sequence<T>.lastIndexOf(element:
var lastIndex = -1
var index = 0
for (item in this) {
checkIndexOverflow(index)
if (element == item)
lastIndex = index
index++
@@ -852,7 +856,7 @@ public inline fun <T, R : Any, C : MutableCollection<in R>> Sequence<T>.mapIndex
public inline fun <T, R, C : MutableCollection<in R>> Sequence<T>.mapIndexedTo(destination: C, transform: (index: Int, T) -> R): C {
var index = 0
for (item in this)
destination.add(transform(index++, item))
destination.add(transform(checkIndexOverflow(index++), item))
return destination
}
@@ -976,7 +980,7 @@ public inline fun <T> Sequence<T>.any(predicate: (T) -> Boolean): Boolean {
*/
public fun <T> Sequence<T>.count(): Int {
var count = 0
for (element in this) count++
for (element in this) checkCountOverflow(++count)
return count
}
@@ -987,7 +991,7 @@ public fun <T> Sequence<T>.count(): Int {
*/
public inline fun <T> Sequence<T>.count(predicate: (T) -> Boolean): Int {
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) checkCountOverflow(++count)
return count
}
@@ -1013,7 +1017,7 @@ public inline fun <T, R> Sequence<T>.fold(initial: R, operation: (acc: R, T) ->
public inline fun <T, R> Sequence<T>.foldIndexed(initial: R, operation: (index: Int, acc: R, T) -> R): R {
var index = 0
var accumulator = initial
for (element in this) accumulator = operation(index++, accumulator, element)
for (element in this) accumulator = operation(checkIndexOverflow(index++), accumulator, element)
return accumulator
}
@@ -1035,7 +1039,7 @@ public inline fun <T> Sequence<T>.forEach(action: (T) -> Unit): Unit {
*/
public inline fun <T> Sequence<T>.forEachIndexed(action: (index: Int, T) -> Unit): Unit {
var index = 0
for (item in this) action(index++, item)
for (item in this) action(checkIndexOverflow(index++), item)
}
/**
@@ -1293,7 +1297,7 @@ public inline fun <S, T : S> Sequence<T>.reduceIndexed(operation: (index: Int, a
var index = 1
var accumulator: S = iterator.next()
while (iterator.hasNext()) {
accumulator = operation(index++, accumulator, iterator.next())
accumulator = operation(checkIndexOverflow(index++), accumulator, iterator.next())
}
return accumulator
}
@@ -1696,7 +1700,7 @@ public fun Sequence<Byte>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
checkCountOverflow(++count)
}
return if (count == 0) Double.NaN else sum / count
}
@@ -1712,7 +1716,7 @@ public fun Sequence<Short>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
checkCountOverflow(++count)
}
return if (count == 0) Double.NaN else sum / count
}
@@ -1728,7 +1732,7 @@ public fun Sequence<Int>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
checkCountOverflow(++count)
}
return if (count == 0) Double.NaN else sum / count
}
@@ -1744,7 +1748,7 @@ public fun Sequence<Long>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
checkCountOverflow(++count)
}
return if (count == 0) Double.NaN else sum / count
}
@@ -1760,7 +1764,7 @@ public fun Sequence<Float>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
checkCountOverflow(++count)
}
return if (count == 0) Double.NaN else sum / count
}
@@ -1776,7 +1780,7 @@ public fun Sequence<Double>.average(): Double {
var count: Int = 0
for (element in this) {
sum += element
count += 1
checkCountOverflow(++count)
}
return if (count == 0) Double.NaN else sum / count
}
libraries/stdlib/common/src/generated/_Strings.kt
+1 -1
View File
@@ -883,7 +883,7 @@ public inline fun CharSequence.count(): Int {
*/
public inline fun CharSequence.count(predicate: (Char) -> Boolean): Int {
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) ++count
return count
}
libraries/stdlib/js/src/kotlin/collections.kt
+20
View File
@@ -6,6 +6,7 @@
package kotlin.collections
import kotlin.comparisons.naturalOrder
import kotlin.internal.InlineOnly
import kotlin.random.Random
/** Returns the array if it's not `null`, or an empty array otherwise. */
@@ -140,3 +141,22 @@ internal actual inline fun <T> Array<out T>.copyToArrayOfAny(isVarargs: Boolean)
this
else
this.copyOf()
@PublishedApi
internal actual fun checkIndexOverflow(index: Int): Int {
if (index < 0) {
throwIndexOverflow()
}
return index
}
@PublishedApi
internal actual fun checkCountOverflow(count: Int): Int {
if (count < 0) {
throwCountOverflow()
}
return count
}
libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt
+30
View File
@@ -9,6 +9,8 @@
package kotlin.collections
import kotlin.*
import kotlin.internal.InlineOnly
import kotlin.internal.apiVersionIsAtLeast
/**
* Returns an immutable list containing only the specified object [element].
@@ -42,3 +44,31 @@ internal actual fun <T> Array<out T>.copyToArrayOfAny(isVarargs: Boolean): Array
@Suppress("UNCHECKED_CAST") (this as Array<Any?>)
else
java.util.Arrays.copyOf(this, this.size, Array<Any?>::class.java)
@PublishedApi
@SinceKotlin("1.3")
@InlineOnly
internal actual inline fun checkIndexOverflow(index: Int): Int {
if (index < 0) {
if (apiVersionIsAtLeast(1, 3, 0))
throwIndexOverflow()
else
throw ArithmeticException("Index overflow has happened.")
}
return index
}
@PublishedApi
@SinceKotlin("1.3")
@InlineOnly
internal actual inline fun checkCountOverflow(count: Int): Int {
if (count < 0) {
if (apiVersionIsAtLeast(1, 3, 0))
throwCountOverflow()
else
throw ArithmeticException("Count overflow has happened.")
}
return count
}
libraries/stdlib/jvm/test/collections/IndexOverflowJVMTest.kt
+106
View File
@@ -37,8 +37,114 @@ class IndexOverflowJVMTest {
override fun next(): Long = counter++
}
}
fun assertIndexOverflow(f: () -> Unit) {
val ex = assertFailsWith<ArithmeticException>(block = f)
assertTrue(ex.message!!.contains("index", ignoreCase = true))
}
fun assertCountOverflow(f: () -> Unit) {
val ex = assertFailsWith<ArithmeticException>(block = f)
assertTrue(ex.message!!.contains("count", ignoreCase = true))
}
fun checkIndexPositive(index: Int) {
if (index < 0) fail("Encountered negative index")
}
}
@Test
fun indexOfOverflowSequence() {
assertIndexOverflow { maxIndexSequence.indexOf("j") }
assertIndexOverflow { maxIndexSequence.lastIndexOf("k") }
assertIndexOverflow { maxIndexSequence.indexOfFirst { false } }
assertIndexOverflow { maxIndexSequence.indexOfLast { false } }
}
@Test
fun indexOfOverflowIterable() {
assertIndexOverflow { maxIndexIterable.indexOf("j") }
assertIndexOverflow { maxIndexIterable.lastIndexOf("k") }
assertIndexOverflow { maxIndexIterable.indexOfFirst { false } }
assertIndexOverflow { maxIndexIterable.indexOfLast { false } }
}
@Test
fun forEachIndexedOverflow() {
assertIndexOverflow { maxIndexSequence.forEachIndexed { index, _ -> checkIndexPositive(index) } }
assertIndexOverflow { maxIndexIterable.forEachIndexed { index, _ -> checkIndexPositive(index) } }
}
@Test
fun withIndexOverflow() {
assertIndexOverflow { maxIndexSequence.withIndex().forEach { (index, _) -> checkIndexPositive(index) } }
assertIndexOverflow { maxIndexIterable.withIndex().forEach { (index, _) -> checkIndexPositive(index) } }
}
@Test
fun countOverflow() {
assertCountOverflow { repeatCounted("k").count() }
assertCountOverflow { repeatCounted("k").count { true } }
assertCountOverflow { repeatCounted("k").asIterable().count() }
assertCountOverflow { repeatCounted("k").asIterable().count { true } }
}
@Test
fun averageCountOverflow() {
assertCountOverflow { repeatCounted(1.0).average() }
assertCountOverflow { repeatCounted(1L).asIterable().average() }
}
private class CountingCollection<T> : AbstractMutableCollection<T>() {
private var _size = 0
override fun add(element: T): Boolean {
if (_size < 0) error("Collection is too long")
_size++
return true
}
override val size: Int get() = _size
override fun iterator(): MutableIterator<T> = error("not implemented")
}
@Test
fun mapIndexedOverflow() {
assertIndexOverflow { maxIndexSequence.mapIndexed { index, _ -> checkIndexPositive(index) }.forEach { } }
assertIndexOverflow { maxIndexSequence.mapIndexedTo(CountingCollection()) { index, _ -> checkIndexPositive(index) } }
assertIndexOverflow { maxIndexIterable.mapIndexedTo(CountingCollection()) { index, _ -> checkIndexPositive(index) } }
}
@Test
fun mapNotNullIndexedOverflow() {
assertIndexOverflow { maxIndexSequence.mapIndexedNotNull { index, _ -> checkIndexPositive(index) }.forEach { } }
assertIndexOverflow { maxIndexSequence.mapIndexedNotNullTo(CountingCollection()) { index, _ -> checkIndexPositive(index) } }
assertIndexOverflow { maxIndexIterable.mapIndexedNotNullTo(CountingCollection()) { index, _ -> checkIndexPositive(index) } }
}
@Test
fun filterIndexedOverflow() {
assertIndexOverflow { maxIndexSequence.filterIndexed { index, _ -> checkIndexPositive(index); true }.forEach { } }
assertIndexOverflow { maxIndexSequence.filterIndexedTo(CountingCollection()) { index, _ -> checkIndexPositive(index); true } }
assertIndexOverflow { maxIndexIterable.filterIndexedTo(CountingCollection()) { index, _ -> checkIndexPositive(index); true } }
}
@Test
fun foldIndexedOverflow() {
assertIndexOverflow { maxIndexSequence.foldIndexed("") { index, acc, s -> checkIndexPositive(index); s } }
assertIndexOverflow { maxIndexIterable.foldIndexed("") { index, acc, s -> checkIndexPositive(index); s } }
}
@Test
fun reduceIndexedOverflow() {
assertIndexOverflow { maxIndexSequence.reduceIndexed { index, acc, s -> checkIndexPositive(index); s } }
assertIndexOverflow { maxIndexIterable.reduceIndexed { index, acc, s -> checkIndexPositive(index); s } }
}
@Test
libraries/stdlib/src/kotlin/collections/Collections.kt
+17
View File
@@ -364,3 +364,20 @@ private fun rangeCheck(size: Int, fromIndex: Int, toIndex: Int) {
}
@PublishedApi
@SinceKotlin("1.3")
internal expect fun checkIndexOverflow(index: Int): Int
@PublishedApi
@SinceKotlin("1.3")
internal expect fun checkCountOverflow(count: Int): Int
@PublishedApi
@SinceKotlin("1.3")
internal fun throwIndexOverflow() { throw ArithmeticException("Index overflow has happened.") }
@PublishedApi
@SinceKotlin("1.3")
internal fun throwCountOverflow() { throw ArithmeticException("Count overflow has happened.") }
libraries/stdlib/src/kotlin/collections/Iterators.kt
+1 -1
View File
@@ -37,5 +37,5 @@ public inline fun <T> Iterator<T>.forEach(operation: (T) -> Unit): Unit {
internal class IndexingIterator<out T>(private val iterator: Iterator<T>) : Iterator<IndexedValue<T>> {
private var index = 0
final override fun hasNext(): Boolean = iterator.hasNext()
final override fun next(): IndexedValue<T> = IndexedValue(index++, iterator.next())
final override fun next(): IndexedValue<T> = IndexedValue(checkIndexOverflow(index++), iterator.next())
}
libraries/stdlib/src/kotlin/collections/Sequences.kt
+2 -2
View File
@@ -178,7 +178,7 @@ constructor(private val sequence: Sequence<T>, private val transformer: (Int, T)
val iterator = sequence.iterator()
var index = 0
override fun next(): R {
return transformer(index++, iterator.next())
return transformer(checkIndexOverflow(index++), iterator.next())
}
override fun hasNext(): Boolean {
@@ -197,7 +197,7 @@ constructor(private val sequence: Sequence<T>) : Sequence<IndexedValue<T>> {
val iterator = sequence.iterator()
var index = 0
override fun next(): IndexedValue<T> {
return IndexedValue(index++, iterator.next())
return IndexedValue(checkIndexOverflow(index++), iterator.next())
}
override fun hasNext(): Boolean {
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+2
View File
@@ -2263,6 +2263,8 @@ public final class kotlin/collections/CollectionsKt {
public static final fun takeLast (Ljava/util/List;I)Ljava/util/List;
public static final fun takeLastWhile (Ljava/util/List;Lkotlin/jvm/functions/Function1;)Ljava/util/List;
public static final fun takeWhile (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)Ljava/util/List;
public static final fun throwCountOverflow ()V
public static final fun throwIndexOverflow ()V
public static final fun toBooleanArray (Ljava/util/Collection;)[Z
public static final fun toByteArray (Ljava/util/Collection;)[B
public static final fun toCharArray (Ljava/util/Collection;)[C
libraries/tools/kotlin-stdlib-gen/src/templates/Aggregates.kt
+10 -5
View File
@@ -155,6 +155,7 @@ object Aggregates : TemplateGroupBase() {
doc { "Returns the number of ${f.element.pluralize()} matching the given [predicate]." }
returns("Int")
body {
fun checkOverflow(value: String) = if (f == Sequences || f == Iterables) "checkCountOverflow($value)" else value
"""
${when (f) {
Iterables -> "if (this is Collection && isEmpty()) return 0"
@@ -162,7 +163,7 @@ object Aggregates : TemplateGroupBase() {
else -> ""
}}
var count = 0
for (element in this) if (predicate(element)) count++
for (element in this) if (predicate(element)) ${checkOverflow("++count")}
return count
"""
}
@@ -175,10 +176,11 @@ object Aggregates : TemplateGroupBase() {
doc { "Returns the number of ${f.element.pluralize()} in this ${f.collection}." }
returns("Int")
body {
fun checkOverflow(value: String) = if (f == Sequences || f == Iterables) "checkCountOverflow($value)" else value
"""
${if (f == Iterables) "if (this is Collection) return size" else ""}
var count = 0
for (element in this) count++
for (element in this) ${checkOverflow("++count")}
return count
"""
}
@@ -474,10 +476,11 @@ object Aggregates : TemplateGroupBase() {
typeParam("R")
returns("R")
body {
fun checkOverflow(value: String) = if (f == Sequences || f == Iterables) "checkIndexOverflow($value)" else value
"""
var index = 0
var accumulator = initial
for (element in this) accumulator = operation(index++, accumulator, element)
for (element in this) accumulator = operation(${checkOverflow("index++")}, accumulator, element)
return accumulator
"""
}
@@ -617,6 +620,7 @@ object Aggregates : TemplateGroupBase() {
typeParam("T : S")
returns("S")
body {
fun checkOverflow(value: String) = if (f == Sequences || f == Iterables) "checkIndexOverflow($value)" else value
"""
val iterator = this.iterator()
if (!iterator.hasNext()) throw UnsupportedOperationException("Empty ${f.doc.collection} can't be reduced.")
@@ -624,7 +628,7 @@ object Aggregates : TemplateGroupBase() {
var index = 1
var accumulator: S = iterator.next()
while (iterator.hasNext()) {
accumulator = operation(index++, accumulator, iterator.next())
accumulator = operation(${checkOverflow("index++")}, accumulator, iterator.next())
}
return accumulator
"""
@@ -899,9 +903,10 @@ object Aggregates : TemplateGroupBase() {
""" }
returns("Unit")
body {
fun checkOverflow(value: String) = if (f == Sequences || f == Iterables) "checkIndexOverflow($value)" else value
"""
var index = 0
for (item in this) action(index++, item)
for (item in this) action(${checkOverflow("index++")}, item)
"""
}
}
libraries/tools/kotlin-stdlib-gen/src/templates/Elements.kt
+5 -1
View File
@@ -52,6 +52,7 @@ object Elements : TemplateGroupBase() {
${if (f == Iterables) "if (this is List) return this.indexOf(element)" else ""}
var index = 0
for (item in this) {
checkIndexOverflow(index)
if (element == item)
return index
index++
@@ -106,6 +107,7 @@ object Elements : TemplateGroupBase() {
var lastIndex = -1
var index = 0
for (item in this) {
checkIndexOverflow(index)
if (element == item)
lastIndex = index
index++
@@ -157,12 +159,13 @@ object Elements : TemplateGroupBase() {
"""
var index = 0
for (item in this) {
${if (f != Lists) "checkIndexOverflow(index)" else ""}
if (predicate(item))
return index
index++
}
return -1
"""
""".lines().filterNot { it.isBlank() }.joinToString("\n")
}
body(CharSequences, ArraysOfPrimitives, ArraysOfObjects) {
@@ -190,6 +193,7 @@ object Elements : TemplateGroupBase() {
var lastIndex = -1
var index = 0
for (item in this) {
checkIndexOverflow(index)
if (predicate(item))
lastIndex = index
index++
libraries/tools/kotlin-stdlib-gen/src/templates/Mapping.kt
+2 -1
View File
@@ -204,10 +204,11 @@ object Mapping : TemplateGroupBase() {
returns("C")
body {
fun checkOverflow(value: String) = if (f == Sequences || f == Iterables) "checkIndexOverflow($value)" else value
"""
var index = 0
for (item in this)
destination.add(transform(index++, item))
destination.add(transform(${checkOverflow("index++")}, item))
return destination
"""
}
libraries/tools/kotlin-stdlib-gen/src/templates/Numeric.kt
+2 -1
View File
@@ -41,12 +41,13 @@ object Numeric : TemplateGroupBase() {
returns("Double")
platformName("averageOf<T>")
body {
fun checkOverflow(value: String) = if (f == Family.Sequences || f == Family.Iterables) "checkCountOverflow($value)" else value
"""
var sum: Double = 0.0
var count: Int = 0
for (element in this) {
sum += element
count += 1
${checkOverflow("++count")}
}
return if (count == 0) Double.NaN else sum / count
"""