LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-08 18:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #2260 Reading end of file on old GFX format (1.x)

Browse Source 
Fixed #2260 DefineExternalImage on old GFX format (1.x)
This commit is contained in:
Jindra Petřík
2024-07-29 20:47:19 +02:00
parent ceda725afc
commit ae8c011636
5 changed files with 197 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -2189,7 +2189,42 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
}
default: { // FWS, GFX
if (allowUncompressed) {
Helper.copyStream(is, os, fileSize - 8);
//In old versions of GFX format (I saw it in 1.02), the fileSize field
// does not contain size of header (signature + version + filesize = 8 bytes)
if (header.gfx && is.available() >= fileSize) {
final InputStream fis = is;
//pass to outputstream all we read
InputStream copyIs = new InputStream() {
@Override
public int read() throws IOException {
int value = fis.read();
os.write(value);
return value;
}
};
//Use special constructor to pass InputStream
SWFInputStream sis = new SWFInputStream(copyIs);
sis.readRECT("displayRect");
sis.readFIXED8("frameRate");
sis.readUI16("frameCount");
int tagIDTagLength = sis.readUI16("tagIDTagLength");
long tagLength = (tagIDTagLength & 0x003F);
if (tagLength == 0x3f) {
sis.readSI32("tagLength");
}
int tagID = (tagIDTagLength) >> 6;
if (tagID == ExporterInfo.ID) {
int exporterVersion = sis.readUI16("exporterInfo");
if (exporterVersion < 0x200) { //assuming version 2 corrected this
Helper.copyStream(is, os, fileSize - sis.getPos());
}
} else {
Helper.copyStream(is, os, fileSize - 8 - sis.getPos());
}
} else {
Helper.copyStream(is, os, fileSize - 8);
}
} else {
throw new IOException("SWF is not compressed");
}