Merge pull request #1907 from greenart7c3/claude/fix-android-runtime-exception-auFbS
Fix URL parsing bounds checking in Url.kt
This commit is contained in:
@@ -228,11 +228,17 @@ class Url(
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val startIndex = urlMarker.indexOf(part)
|
||||||
|
if (startIndex < 0 || startIndex >= originalUrl.length) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
val nextPart = nextExistingPart(part)
|
val nextPart = nextExistingPart(part)
|
||||||
return if (nextPart == null) {
|
return if (nextPart == null) {
|
||||||
originalUrl.substring(urlMarker.indexOf(part))
|
originalUrl.substring(startIndex)
|
||||||
} else {
|
} else {
|
||||||
originalUrl.substring(urlMarker.indexOf(part), urlMarker.indexOf(nextPart))
|
val endIndex = urlMarker.indexOf(nextPart)
|
||||||
|
originalUrl.substring(startIndex, minOf(endIndex, originalUrl.length))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user