GitHub/SWCompression
1
0
Fork 0
mirror of https://github.com/tsolomko/SWCompression.git synced 2026-06-23 14:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check comp size after reading compressed data and simplify filters-apply code

Browse Source
This commit is contained in:
Timofey Solomko
2017-11-23 19:38:46 +03:00
parent a447e6adcf
commit 6f88a765a8
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/XZ/XZBlock.swift
+6 -9
View File
@@ -70,17 +70,14 @@ struct XZBlock {
else { throw XZError.wrongInfoCRC }
pointerData.index += 4
var intResult = pointerData
var out = pointerData
let compressedDataStart = pointerData.index
for filterIndex in 0..<filtersCount - 1 {
let intData = try filters[filtersCount.toInt() - filterIndex.toInt() - 1](intResult)
intResult = DataWithPointer(data: intData)
for filterIndex in stride(from: filtersCount - 1, through: 0, by: -1) {
out = DataWithPointer(data: try filters[filterIndex.toInt()](out))
}
guard compressedSize < 0 || compressedSize == pointerData.index - compressedDataStart
else { throw XZError.wrongDataSize }
let out = try filters[filtersCount.toInt() - 1](intResult)
guard uncompressedSize < 0 || uncompressedSize == out.count
guard compressedSize < 0 || compressedSize == pointerData.index - compressedDataStart,
uncompressedSize < 0 || uncompressedSize == out.data.count
else { throw XZError.wrongDataSize }
let unpaddedSize = pointerData.index - blockHeaderStartIndex
@@ -94,7 +91,7 @@ struct XZBlock {
}
}
self.data = out
self.data = out.data
self.unpaddedSize = unpaddedSize + checkSize
}