yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 02:09:44 +02:00
Code Issues Releases Wiki Activity

GP-1101 Added missing isPDBLoaded flag assignment to the RTTIWindowsClassRecoverer which was inadvertently left out during refactoring.

Browse source
This commit is contained in:
ghidra007 2021-07-06 14:35:02 -04:00
parent 9a1e83d9ce
commit b8e8c094a1
2 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Features/Decompiler/ghidra_scripts/RecoverClassesFromRTTIScript.java
View file

@ -275,12 +275,8 @@ public class RecoverClassesFromRTTIScript extends GhidraScript {
private boolean isPDBLoadedInProgram() { private boolean isPDBLoadedInProgram() {
Options options = currentProgram.getOptions("Program Information"); Options options = currentProgram.getOptions("Program Information");
isPDBLoaded = false; return options.getBoolean("PDB Loaded", false);
Object isPDBLoadedObject = options.getObject("PDB Loaded", null);
if (isPDBLoadedObject != null) {
isPDBLoaded = (boolean) isPDBLoadedObject;
}
return isPDBLoaded;
} }
public String validate() { public String validate() {

6
Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIWindowsClassRecoverer.java
View file

@ -91,6 +91,8 @@ public class RTTIWindowsClassRecoverer extends RTTIClassRecoverer {
super(program, location, tool, api, createBookmarks, useShortTemplates, nameVFunctions, super(program, location, tool, api, createBookmarks, useShortTemplates, nameVFunctions,
monitor); monitor);
this.isPDBLoaded = isPDBLoaded;
} }
@Override @Override
@ -147,8 +149,6 @@ public class RTTIWindowsClassRecoverer extends RTTIClassRecoverer {
@Override @Override
public List<RecoveredClass> createRecoveredClasses() { public List<RecoveredClass> createRecoveredClasses() {
//TODO: check the classPath var for null and return null if it is null
List<Symbol> vftableSymbols; List<Symbol> vftableSymbols;
try { try {
vftableSymbols = getListOfVftableSymbols(); vftableSymbols = getListOfVftableSymbols();
@ -254,8 +254,6 @@ public class RTTIWindowsClassRecoverer extends RTTIClassRecoverer {
return false; return false;
} }
/** /**
* Method to determine if the current program has RTTI data applied to it * Method to determine if the current program has RTTI data applied to it
* @return true if the current program has RTTI data applied to it * @return true if the current program has RTTI data applied to it