Avoid division in string-to-unsigned conversions (KT-26309)
This commit is contained in:
@@ -198,14 +198,26 @@ public fun String.toUIntOrNull(radix: Int): UInt? {
|
|||||||
start = 0
|
start = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val limitForMaxRadix = 119304647u // limit / 36
|
||||||
|
|
||||||
|
var limitBeforeMul = limitForMaxRadix
|
||||||
val uradix = radix.toUInt()
|
val uradix = radix.toUInt()
|
||||||
val limitBeforeMul = limit / uradix
|
|
||||||
var result = 0u
|
var result = 0u
|
||||||
for (i in start until length) {
|
for (i in start until length) {
|
||||||
val digit = digitOf(this[i], radix)
|
val digit = digitOf(this[i], radix)
|
||||||
|
|
||||||
if (digit < 0) return null
|
if (digit < 0) return null
|
||||||
if (result > limitBeforeMul) return null
|
if (result > limitBeforeMul) {
|
||||||
|
if (limitBeforeMul == limitForMaxRadix) {
|
||||||
|
limitBeforeMul = limit / uradix
|
||||||
|
|
||||||
|
if (result > limitBeforeMul) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
result *= uradix
|
result *= uradix
|
||||||
|
|
||||||
@@ -251,14 +263,26 @@ public fun String.toULongOrNull(radix: Int): ULong? {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
val uradix = radix.toUInt()
|
val limitForMaxRadix = 512409557603043100uL // limit / 36
|
||||||
val limitBeforeMul = limit / uradix
|
|
||||||
|
var limitBeforeMul = limitForMaxRadix
|
||||||
|
val uradix = radix.toULong()
|
||||||
var result = 0uL
|
var result = 0uL
|
||||||
for (i in start until length) {
|
for (i in start until length) {
|
||||||
val digit = digitOf(this[i], radix)
|
val digit = digitOf(this[i], radix)
|
||||||
|
|
||||||
if (digit < 0) return null
|
if (digit < 0) return null
|
||||||
if (result > limitBeforeMul) return null
|
if (result > limitBeforeMul) {
|
||||||
|
if (limitBeforeMul == limitForMaxRadix) {
|
||||||
|
limitBeforeMul = limit / uradix
|
||||||
|
|
||||||
|
if (result > limitBeforeMul) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
result *= uradix
|
result *= uradix
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user