eliott/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-04-25 17:25:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1832_ghidra007_improve_isGcc--SQUASHED' into patch

Browse Source
This commit is contained in:
Ryan Kurtz
2022-03-19 01:01:10 -04:00
parent 4162b9e812 1ae9218eba
commit 8315e6a77b
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIGccClassRecoverer.java
View File

@@ -21,6 +21,7 @@ import java.util.*;
import ghidra.app.cmd.label.DemanglerCmd;
import ghidra.app.util.NamespaceUtils;
import ghidra.app.util.demangler.*;
import ghidra.app.util.opinion.ElfLoader;
import ghidra.framework.plugintool.PluginTool;
import ghidra.program.flatapi.FlatProgramAPI;
import ghidra.program.model.address.*;
@@ -133,8 +134,7 @@ public class RTTIGccClassRecoverer extends RTTIClassRecoverer {
private boolean isGcc() {
boolean isELF = program.getExecutableFormat().contains("ELF");
if (!isELF) {
if (!ElfLoader.ELF_NAME.equals(program.getExecutableFormat())) {
return false;
}
@@ -149,7 +149,7 @@ public class RTTIGccClassRecoverer extends RTTIClassRecoverer {
return false;
}
if (!commentBlock.isLoaded()) {
if (!commentBlock.isInitialized()) {
return false;
}