Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-0 updated check for Gnu demangler check to not rely on option internals, which were changed to remove the previously checked for string, but instead the Options class name. This fixed the four breaking RTTI tests.

ghidra00793c7ffa95968
diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIGccClassRecoverer.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIGccClassRecoverer.java
index 2e125cc115..f75ebdc309 100644
--- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIGccClassRecoverer.java
+++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIGccClassRecoverer.java
@@ -3069,7 +3069,7 @@ public class RTTIGccClassRecoverer extends RTTIClassRecoverer {
// Currently no good way to do this since this is in Decompiler package and GnuDemangler
// is in its own package. Once no longer a script but an analyzer in Base, update to
// do !(options instanceof GnuDemanglerOptions)
- if (!options.toString().contains("gnu")) {
+ if (!options.getClass().getName().contains("Gnu")) {
continue;
}