From d57e2cae31fe2b28d156da855eb2b1819d27249d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 31 Aug 2025 17:12:54 +0200
Subject: [PATCH] newclass fix

---
 .../instructions/construction/NewClassIns.java   | 16 +++++++++++++++-
 .../jpexs/decompiler/graph/TranslateStack.java   |  3 +++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java
index 809bdaef4..c8e9d5ecc 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java
@@ -27,7 +27,9 @@ import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.flash.helpers.HighlightedTextWriter;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.TranslateStack;
+import com.jpexs.decompiler.graph.model.DuplicateSourceItem;
 import com.jpexs.decompiler.graph.model.LocalData;
+import com.jpexs.decompiler.graph.model.SetTemporaryItem;
 import java.util.HashSet;
 import java.util.List;
 
@@ -49,7 +51,19 @@ public class NewClassIns extends InstructionDefinition {
     public void translate(AVM2LocalData localData, TranslateStack stack, AVM2Instruction ins, List<GraphTargetItem> output, String path) throws InterruptedException {
         int clsIndex = ins.operands[0];
         HighlightedTextWriter writer = new HighlightedTextWriter(Configuration.getCodeFormatting(), false);
-        stack.pop().toString(writer, LocalData.create(localData.callStack /*??*/, localData.abcIndex, localData.abc, localData.localRegNames, localData.fullyQualifiedNames, new HashSet<>(), ScriptExportMode.AS, localData.swfVersion, localData.usedDeobfuscations));
+        GraphTargetItem obj = stack.pop();
+        
+        if (obj instanceof DuplicateSourceItem) {
+            DuplicateSourceItem ds = (DuplicateSourceItem) obj;
+            if (!output.isEmpty() && output.get(output.size() - 1) instanceof SetTemporaryItem) {
+                SetTemporaryItem st = (SetTemporaryItem) output.get(output.size() - 1);
+                if (ds.tempIndex == st.tempIndex) {
+                    output.remove(output.size() - 1);
+                    stack.moveToStack(output);
+                }
+            }
+        }                
+        obj.toString(writer, LocalData.create(localData.callStack /*??*/, localData.abcIndex, localData.abc, localData.localRegNames, localData.fullyQualifiedNames, new HashSet<>(), ScriptExportMode.AS, localData.swfVersion, localData.usedDeobfuscations));
         writer.finishHilights();
         String baseType = writer.toString();
         ABC abc = localData.abc;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/TranslateStack.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/TranslateStack.java
index 9ee4e5e99..8fa9c0c99 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/TranslateStack.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/TranslateStack.java
@@ -347,6 +347,9 @@ public class TranslateStack extends Stack<GraphTargetItem> {
     }
     
     public void finishBlock(List<GraphTargetItem> output) {
+        if (connectedOutput == null) {
+            return;
+        }
         /*int pos = output.size();
         
         for (int i = size() - 1; i >= 0; i--) {