mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-20 23:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tidied up GIF and BZIP2 extractors

Browse source
This commit is contained in:
n1474335 2019-11-08 13:49:39 +00:00
parent 8d660e53b2
commit 04f1fa06ad
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/core/lib/FileSignatures.mjs
View file

@ -2456,10 +2456,10 @@ export function extractGIF(bytes, offset) {
// Move to Graphic Control Extension for frame #1. // Move to Graphic Control Extension for frame #1.
stream.continueUntil([0x21, 0xf9]); stream.continueUntil([0x21, 0xf9]);
stream.moveForwardsBy(2); stream.moveForwardsBy(2);
while (stream.hasMore()) {
while (stream.hasMore()) {
// Move to Image descriptor. // Move to Image descriptor.
stream.moveForwardsBy(stream.getBytes(1)[0]+1); stream.moveForwardsBy(stream.readInt(1) + 1);
// Move past Image descriptor to the image data. // Move past Image descriptor to the image data.
stream.moveForwardsBy(11); stream.moveForwardsBy(11);
@ -2467,14 +2467,16 @@ export function extractGIF(bytes, offset) {
// Loop until next Graphic Control Extension. // Loop until next Graphic Control Extension.
while (stream.getBytes(2) !== [0x21, 0xf9]) { while (stream.getBytes(2) !== [0x21, 0xf9]) {
stream.moveBackwardsBy(2); stream.moveBackwardsBy(2);
stream.moveForwardsBy(stream.getBytes(1)[0]); stream.moveForwardsBy(stream.readInt(1));
if (!stream.getBytes(1)[0]) if (!stream.readInt(1))
break; break;
stream.moveBackwardsBy(1); stream.moveBackwardsBy(1);
} }
// When the end of the file is [0x00, 0x3b], end. // When the end of the file is [0x00, 0x3b], end.
if (stream.getBytes(1)[0] === 0x3b) if (stream.readInt(1) === 0x3b)
break; break;
stream.moveForwardsBy(1); stream.moveForwardsBy(1);
} }
return stream.carve(); return stream.carve();
@ -2838,10 +2840,10 @@ export function extractBZIP2(bytes, offset) {
[0xbb, 0x92, 0x29, 0xc2, 0x84], [0xbb, 0x92, 0x29, 0xc2, 0x84],
[0x5d, 0xc9, 0x14, 0xe1, 0x42], [0x5d, 0xc9, 0x14, 0xe1, 0x42],
[0x2e, 0xe4, 0x8a, 0x70, 0xa1], [0x2e, 0xe4, 0x8a, 0x70, 0xa1],
[0x17, 0x72, 0x45, 0x38, 0x50]]; [0x17, 0x72, 0x45, 0x38, 0x50]
];
for (let i = 0; i < lookingfor.length; i++) { for (let i = 0; i < lookingfor.length; i++) {
// Continue until an EOF. // Continue until an EOF.
stream.continueUntil(lookingfor[i]); stream.continueUntil(lookingfor[i]);
if (stream.getBytes(5).join("") === lookingfor[i].join("")) if (stream.getBytes(5).join("") === lookingfor[i].join(""))