LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-16 01:02:25 +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

23
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java
View File

@@ -273,6 +273,7 @@ import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD;
import com.jpexs.decompiler.flash.types.shaperecords.StraightEdgeRecord;
import com.jpexs.decompiler.flash.types.shaperecords.StyleChangeRecord;
import com.jpexs.helpers.ByteArrayRange;
import com.jpexs.helpers.FakeMemoryInputStream;
import com.jpexs.helpers.Helper;
import com.jpexs.helpers.ImmediateFuture;
import com.jpexs.helpers.MemoryInputStream;
@@ -282,6 +283,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Arrays;
@@ -384,6 +386,19 @@ public class SWFInputStream implements AutoCloseable {
this(swf, data, 0L, data.length);
}
/**
* HACK: Special constructor to handle old GFX format
* - DO NOT USE for normal purposes - it won't read tags, etc...
* @param is
*/
public SWFInputStream(InputStream is) throws IOException {
this.swf = null;
this.startingPos = 0;
this.data = null;
this.limit = Integer.MAX_VALUE;
this.is = new FakeMemoryInputStream(is);
}
public SWF getSwf() {
return swf;
}
@@ -810,10 +825,13 @@ public class SWFInputStream implements AutoCloseable {
* @return ByteArrayRange object
* @throws IOException
*/
public ByteArrayRange readByteRangeEx(long count, String name, DumpInfoSpecialType specialType, Object specialValue) throws IOException {
public ByteArrayRange readByteRangeEx(long count, String name, DumpInfoSpecialType specialType, Object specialValue) throws IOException {
if (count <= 0) {
return ByteArrayRange.EMPTY;
}
if (data == null) {
throw new RuntimeException("Data not available - use constructor with data rather than inputstream");
}
newDumpLevel(name, "bytes", specialType, specialValue);
@@ -1599,6 +1617,9 @@ public class SWFInputStream implements AutoCloseable {
* @throws java.lang.InterruptedException
*/
public Tag readTag(Timelined timelined, int level, long pos, boolean resolve, boolean parallel, boolean skipUnusualTags, boolean lazy) throws IOException, InterruptedException {
if (data == null) {
throw new RuntimeException("Data not available - use constructor with data rather than inputstream");
}
int tagIDTagLength = readUI16("tagIDTagLength");
int tagID = (tagIDTagLength) >> 6;