From c17e5cd442a93e9dbe57f151391490bbfed874c9 Mon Sep 17 00:00:00 2001 From: caheckman <48068198+caheckman@users.noreply.github.com> Date: Fri, 26 May 2023 11:35:26 -0400 Subject: [PATCH] GP-3369 DecompileOptions are optional for DecompInterface --- .../main/java/ghidra/app/decompiler/DecompInterface.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompInterface.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompInterface.java index aab164f9fd..55b72ab21c 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompInterface.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompInterface.java @@ -31,6 +31,8 @@ import ghidra.program.model.lang.*; import ghidra.program.model.listing.Function; import ghidra.program.model.listing.Program; import ghidra.program.model.pcode.*; +import ghidra.program.model.symbol.IdentityNameTransformer; +import ghidra.program.model.symbol.NameTransformer; import ghidra.util.Msg; import ghidra.util.task.CancelledListener; import ghidra.util.task.TaskMonitor; @@ -370,7 +372,9 @@ public class DecompInterface { } compilerSpec = spec; - dtmanage = new PcodeDataTypeManager(prog, options.getNameTransformer()); + NameTransformer transformer = + (options == null) ? new IdentityNameTransformer() : options.getNameTransformer(); + dtmanage = new PcodeDataTypeManager(prog, transformer); try { decompCallback = new DecompileCallback(prog, pcodelanguage, program.getCompilerSpec(), dtmanage);