From 3e6b1ccfb8afaddfbb246bd32e5e786007dbb802 Mon Sep 17 00:00:00 2001 From: ghizard <50744617+ghizard@users.noreply.github.com> Date: Sat, 5 Aug 2023 11:11:44 -0400 Subject: [PATCH] GP-0 fix MicrosoftDemangler processing from GP-3671... failing test --- .../MicrosoftDmang/src/main/java/mdemangler/MDMangGhidra.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDMangGhidra.java b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDMangGhidra.java index 829c1390c3..f6edcedf57 100644 --- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDMangGhidra.java +++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDMangGhidra.java @@ -22,6 +22,7 @@ import ghidra.program.model.lang.CompilerSpec; import mdemangler.datatype.MDDataType; import mdemangler.datatype.MDVarArgsType; import mdemangler.datatype.complex.*; +import mdemangler.datatype.extended.MDArrayReferencedType; import mdemangler.datatype.modifier.*; import mdemangler.functiontype.*; import mdemangler.naming.*; @@ -817,6 +818,9 @@ public class MDMangGhidra extends MDMang { else if (datatype instanceof MDVarArgsType) { resultDataType.setVarArgs(); } + else if (datatype instanceof MDArrayReferencedType arrRefType) { + return processDataType(resultDataType, arrRefType.getReferencedType()); + } else if (datatype instanceof MDStdNullPtrType) { resultDataType.setName(datatype.toString()); }