#627 Filter swf not working fixed

This commit is contained in:
honfika
2014-07-31 18:46:21 +02:00
parent 49bb3ec2bf
commit c7fb387859
2 changed files with 5 additions and 6 deletions
@@ -122,9 +122,7 @@ public class ActionListReader {
* @throws IOException * @throws IOException
* @throws java.lang.InterruptedException * @throws java.lang.InterruptedException
*/ */
public static List<Action> readActionList(List<DisassemblyListener> listeners, SWFInputStream sis, int version, int ip, int endIp, String path) throws IOException, InterruptedException { private static List<Action> readActionList(List<DisassemblyListener> listeners, SWFInputStream sis, int version, int ip, int endIp, String path) throws IOException, InterruptedException {
boolean deobfuscate = Configuration.autoDeobfuscate.get();
ConstantPool cpool = new ConstantPool(); ConstantPool cpool = new ConstantPool();
// List of the actions. N. item contains the action which starts in offset N. // List of the actions. N. item contains the action which starts in offset N.
@@ -189,7 +187,7 @@ public class ActionListReader {
updateContainerSizes(actions, containerLastActions); updateContainerSizes(actions, containerLastActions);
updateActionLengths(actions, version); updateActionLengths(actions, version);
if (deobfuscate) { if (Configuration.autoDeobfuscate.get()) {
try { try {
actions = deobfuscateActionList(listeners, actions, version, ip, path); actions = deobfuscateActionList(listeners, actions, version, ip, path);
updateActionLengths(actions, version); updateActionLengths(actions, version);
@@ -216,7 +214,7 @@ public class ActionListReader {
* @throws IOException * @throws IOException
* @throws java.lang.InterruptedException * @throws java.lang.InterruptedException
*/ */
public static List<Action> deobfuscateActionList(List<DisassemblyListener> listeners, List<Action> actions, int version, int ip, String path) throws IOException, InterruptedException { private static List<Action> deobfuscateActionList(List<DisassemblyListener> listeners, List<Action> actions, int version, int ip, String path) throws IOException, InterruptedException {
if (actions.isEmpty()) { if (actions.isEmpty()) {
return actions; return actions;
} }
@@ -525,7 +523,7 @@ public class ActionListReader {
* @param removeWhenLast * @param removeWhenLast
* @return * @return
*/ */
public static boolean removeAction(List<Action> actions, int index, int version, boolean removeWhenLast) { private static boolean removeAction(List<Action> actions, int index, int version, boolean removeWhenLast) {
if (index < 0 || actions.size() <= index) { if (index < 0 || actions.size() <= index) {
return false; return false;
@@ -2139,6 +2139,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
showDetail(DETAILCARDEMPTYPANEL); showDetail(DETAILCARDEMPTYPANEL);
} else { } else {
treePanel.add(new JScrollPane(tagTree), BorderLayout.CENTER); treePanel.add(new JScrollPane(tagTree), BorderLayout.CENTER);
treePanel.add(searchPanel, BorderLayout.SOUTH);
treePanelMode = TreePanelMode.TAG_TREE; treePanelMode = TreePanelMode.TAG_TREE;
} }
reload(true); reload(true);