Merge pull request #5 from GDATAAdvancedAnalytics/fix-emu-exception

meck-gd · web-flow · commit f0e00406635e · 2025-06-17T17:11:01.000+02:00
InstructionEmulator: Fix rare exception caused by null values in arrays
diff --git a/de4dot.blocks/cflow/InstructionEmulator.cs b/de4dot.blocks/cflow/InstructionEmulator.cs
@@ -535,7 +535,10 @@ void Emulate_Newarr(Instruction instr)
             if (val.IsInt32())
             {
                 Int32Value arrSize = (Int32Value)val;
-                List<Value> arr = new List<Value>(new Value[arrSize.Value]);
+                List<Value> arr = new List<Value>(arrSize.Value);
+                for (int i = 0; i < arrSize.Value; i++) {
+	                arr.Add(new UnknownValue());
+                }
                 valueStack.Push(new ObjectValue(arr));
             }
             else

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,10 @@ void Emulate_Newarr(Instruction instr)`
`535`	`535`	`if (val.IsInt32())`
`536`	`536`	`{`
`537`	`537`	`Int32Value arrSize = (Int32Value)val;`
`538`		`- List<Value> arr = new List<Value>(new Value[arrSize.Value]);`
	`538`	`+ List<Value> arr = new List<Value>(arrSize.Value);`
	`539`	`+ for (int i = 0; i < arrSize.Value; i++) {`
	`540`	`+ arr.Add(new UnknownValue());`
	`541`	`+ }`
`539`	`542`	`valueStack.Push(new ObjectValue(arr));`
`540`	`543`	`}`
`541`	`544`	`else`