mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Fix (de-)compression

Browse Source 
- detect too much compressed input
- correctly write more than 64 kB (INITIAL_REPACK_SIZE) compressed output
This commit is contained in:
Kai Bolay
2020-05-18 12:33:42 -04:00
committed by dev747368
parent 12a6b23853
commit 096ff3bb37
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/png/CrushedPNGUtil.java
View File

@@ -9,8 +9,6 @@ import java.nio.ByteBuffer;
import java.util.*;
import java.util.zip.*;
import org.apache.commons.compress.utils.IOUtils;
import ghidra.file.formats.zlib.ZLIB;
import ghidra.util.task.TaskMonitor;
@@ -102,37 +100,31 @@ public class CrushedPNGUtil {
int expectedSize =
(ihdrChunk.getBytesPerLine() * ihdrChunk.getImgHeight()) +
ihdrChunk.getRowFilterBytes();
byte[] results;
try (ByteArrayOutputStream decompressedOutput = new ByteArrayOutputStream(expectedSize);
InflaterOutputStream inflaterStream = new InflaterOutputStream(decompressedOutput)) {
InputStream inputStream = new ByteArrayInputStream(getFixedIdatDataBytes(idatStream));
byte[] results = new byte[expectedSize];
Inflater inflater = new Inflater();
inflater.setInput(IOUtils.toByteArray(inputStream));
//inflater.setInput(convertInputStreamToByteArray(inputStream));
int numDecompressed = inflater.inflate(results);
if (numDecompressed != expectedSize) {
inflaterStream.write(ZLIB_COMPRESSION_DEFAULT);
idatStream.writeTo(inflaterStream);
inflaterStream.finish();
results = decompressedOutput.toByteArray();
}
if (results.length != expectedSize) {
throw new PNGFormatException("Decompression Error, expected " + expectedSize +
" bytes, but got " + numDecompressed + " bytes");
" bytes, but got " + results.length + " bytes");
}
//Processes the IDAT chunks to 'uncrushify' them
processIDATChunks(ihdrChunk, results);
//Conservative sized repack array
byte[] tmp = new byte[CrushedPNGConstants.INITIAL_REPACK_SIZE];
Deflater deflater = new Deflater();
deflater.setInput(results);
deflater.finish();
int numCompressed = deflater.deflate(tmp);
try (ByteArrayOutputStream compressedOutput = new ByteArrayOutputStream(CrushedPNGConstants.INITIAL_REPACK_SIZE);
DeflaterOutputStream deflaterStream = new DeflaterOutputStream(compressedOutput)) {
if (numCompressed <= 0) {
throw new PNGFormatException("Number of compressed bytes <= 0");
deflaterStream.write(results);
deflaterStream.finish();
deflaterStream.flush();
repackArray = compressedOutput.toByteArray();
}
repackArray = new byte[numCompressed];
for (int i = 0; i < numCompressed; i++) {
repackArray[i] = tmp[i];
}
}
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();