LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-24 23:37:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Detect uninitialized class fields only in __Packages folder

Browse Source
This commit is contained in:
Jindra Petřík
2025-07-02 21:11:43 +02:00
parent 0162e90871
commit ee4d21b88f
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6286,9 +6286,13 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
public boolean needsCalculatingAS2UninitializeClassTraits(ASMSource src) {
if (!isAS3()) {
if (src instanceof DoInitActionTag) {
if (uninitializedAs2ClassTraits == null) {
return true;
}
DoInitActionTag doi = (DoInitActionTag) src;
String exportName = doi.getSwf().getCharacter(doi.getCharacterId()).getExportName();
if (exportName != null && exportName.startsWith("__Packages.")) {
if (uninitializedAs2ClassTraits == null) {
return true;
}
}
}
}
return false;

11
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
View File

@@ -39,6 +39,7 @@ import com.jpexs.helpers.ByteArrayRange;
import com.jpexs.helpers.Helper;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -158,7 +159,7 @@ public class DoInitActionTag extends Tag implements CharacterIdTag, ASMSource {
actions = getActions();
}
return Action.actionsToSource(swf.getUninitializedAs2ClassTraits(), this, actions, getScriptName(), writer, getCharset());
return Action.actionsToSource(requiresUninitielizedClassTraitsDetection() ? swf.getUninitializedAs2ClassTraits() : new HashMap<>(), this, actions, getScriptName(), writer, getCharset());
}
@Override
@@ -167,7 +168,11 @@ public class DoInitActionTag extends Tag implements CharacterIdTag, ASMSource {
actions = getActions();
}
return Action.actionsToSource(swf.getUninitializedAs2ClassTraits(), this, actions, getScriptName(), writer, getCharset(), treeOperations);
return Action.actionsToSource(requiresUninitielizedClassTraitsDetection() ? swf.getUninitializedAs2ClassTraits() : new HashMap<>(), this, actions, getScriptName(), writer, getCharset(), treeOperations);
}
private boolean requiresUninitielizedClassTraitsDetection() {
return swf.needsCalculatingAS2UninitializeClassTraits(this);
}
@Override
@@ -297,7 +302,7 @@ public class DoInitActionTag extends Tag implements CharacterIdTag, ASMSource {
@Override
public List<GraphTargetItem> getActionsToTree() {
try {
return Action.actionsToTree(swf.getUninitializedAs2ClassTraits(), true, false, getActions(), swf.version, 0, getScriptName(), swf.getCharset());
return Action.actionsToTree(requiresUninitielizedClassTraitsDetection() ? swf.getUninitializedAs2ClassTraits() : new HashMap<>(), true, false, getActions(), swf.version, 0, getScriptName(), swf.getCharset());
} catch (InterruptedException ex) {
return new ArrayList<>();
}