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

Minor. Clean ZipImplementation.kt

Browse Source
This commit is contained in:
Denis.Zharkov
2022-10-05 12:14:33 +02:00
committed by Space Team
parent 337f461ad8
commit d9701c71b7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ZipImplementation.kt
+5 -4
View File
@@ -56,6 +56,7 @@ fun MappedByteBuffer.contentsToByteArray(
result result
} }
ZipEntryDescription.CompressionKind.PLAIN -> compressed.copyOf(zipEntryDescription.compressedSize) ZipEntryDescription.CompressionKind.PLAIN -> compressed.copyOf(zipEntryDescription.compressedSize)
} }
} }
@@ -81,9 +82,9 @@ fun MappedByteBuffer.parseCentralDirectory(): List<ZipEntryDescription> {
val compressedSize = getInt(currentOffset + 20) val compressedSize = getInt(currentOffset + 20)
val uncompressedSize = getInt(currentOffset + 24) val uncompressedSize = getInt(currentOffset + 24)
val fileNameLength = getUnsignedShort(currentOffset + 28).toInt() val fileNameLength = getUnsignedShort(currentOffset + 28)
val extraLength = getUnsignedShort(currentOffset + 30).toInt() val extraLength = getUnsignedShort(currentOffset + 30)
val fileCommentLength = getUnsignedShort(currentOffset + 32).toInt() val fileCommentLength = getUnsignedShort(currentOffset + 32)
val offsetOfFileData = getInt(currentOffset + 42) val offsetOfFileData = getInt(currentOffset + 42)
@@ -103,7 +104,7 @@ fun MappedByteBuffer.parseCentralDirectory(): List<ZipEntryDescription> {
// We support version needed to extract 10 and 20. However, there are zip // We support version needed to extract 10 and 20. However, there are zip
// files in the eco-system with entries with invalid version to extract // files in the eco-system with entries with invalid version to extract
// of 0. Therefore, we just check that the version is between 0 and 20. // of 0. Therefore, we just check that the version is between 0 and 20.
require(0 <= versionNeededToExtract && versionNeededToExtract <= 20) { require(versionNeededToExtract in 0..20) {
"Unexpected versionNeededToExtract ($versionNeededToExtract) at $name" "Unexpected versionNeededToExtract ($versionNeededToExtract) at $name"
} }