Merge commit 'refs/pull/932/head' of github.com:gchq/CyberChef into n1073645-moreExtractors

This commit is contained in:
n1474335 2020-03-06 13:34:35 +00:00
commit 154b9386f7
1 changed files with 9 additions and 12 deletions

View File

@ -3887,22 +3887,19 @@ export function extractLZOP(bytes, offset) {
// Move past checksum.
stream.moveForwardsBy(4);
try {
while (stream.hasMore()) {
const uncompSize = stream.readInt(4, "be");
while (stream.hasMore()) {
const uncompSize = stream.readInt(4, "be");
// If data has no length, break.
if (uncompSize === 0)
break;
// If data has no length, break.
if (uncompSize === 0)
break;
const compSize = stream.readInt(4, "be");
const compSize = stream.readInt(4, "be");
const numCheckSumSkip = (uncompSize === compSize) ? numCheckSumD : numCheckSumD + numCheckSumC;
const numCheckSumSkip = (uncompSize === compSize) ? numCheckSumD : numCheckSumD + numCheckSumC;
// skip forwards by compressed data size and the size of the checksum(s).
stream.moveForwardsBy(compSize + (numCheckSumSkip * 4));
}
} catch (error) {
// skip forwards by compressed data size and the size of the checksum(s).
stream.moveForwardsBy(compSize + (numCheckSumSkip * 4));
}
return stream.carve();