LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-26 19:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fileattributes exception fix - reading again workaround

Browse Source
This commit is contained in:
Jindra Petřík
2014-08-24 07:09:50 +02:00
parent 1711273a69
commit ff4484d066
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/jpexs/decompiler/flash/SWFInputStream.java
View File

@@ -1010,6 +1010,9 @@ public class SWFInputStream implements AutoCloseable {
executor = Executors.newFixedThreadPool(Configuration.parallelThreadCount.get());
futureResults = new ArrayList<>();
}
int tagCnt = 0;
int faPos = 0;
FileAttributesTag fileAttributes = null;
List<Tag> tags = new ArrayList<>();
Tag tag;
boolean isAS3 = false;
@@ -1021,6 +1024,7 @@ public class SWFInputStream implements AutoCloseable {
} catch (EOFException | EndOfStreamException ex) {
tag = null;
}
tagCnt++;
DumpInfo di = dumpInfo;
if (di != null && tag != null) {
di.name = tag.getName();
@@ -1044,11 +1048,11 @@ public class SWFInputStream implements AutoCloseable {
} else {
switch (tag.getId()) {
case FileAttributesTag.ID: //FileAttributes
Tag ft = tag;
if (ft instanceof TagStub) {
ft = resolveTag((TagStub) tag, level, parallel, skipUnusualTags);
faPos = tagCnt-1; //should be 0, as it is first tag, but anyway
if (tag instanceof TagStub) {
tag = resolveTag((TagStub) tag, level, parallel, skipUnusualTags);
}
FileAttributesTag fileAttributes = (FileAttributesTag) ft;
fileAttributes = (FileAttributesTag) tag;
if (fileAttributes.actionScript3) {
isAS3 = true;
}
@@ -1112,6 +1116,10 @@ public class SWFInputStream implements AutoCloseable {
executor.shutdown();
}
//Workaround to not reading fileattributes twice. TODO:Handle this better
if(parallel && fileAttributes!=null){
tags.add(faPos,fileAttributes);
}
return tags;
}