yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-688_ghidra007_fixRTTIVftableCount' into patch
This commit is contained in:
ghidra1 2021-02-23 13:23:53 -05:00
commit 7a3945f3bc
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/cmd/data/rtti/RttiUtil.java
View file

@ -25,8 +25,7 @@ import ghidra.app.util.PseudoDisassembler;
import ghidra.app.util.datatype.microsoft.MSDataTypeUtils; import ghidra.app.util.datatype.microsoft.MSDataTypeUtils;
import ghidra.program.model.address.Address; import ghidra.program.model.address.Address;
import ghidra.program.model.address.AddressSetView; import ghidra.program.model.address.AddressSetView;
import ghidra.program.model.listing.GhidraClass; import ghidra.program.model.listing.*;
import ghidra.program.model.listing.Program;
import ghidra.program.model.mem.Memory; import ghidra.program.model.mem.Memory;
import ghidra.program.model.mem.MemoryBlock; import ghidra.program.model.mem.MemoryBlock;
import ghidra.program.model.symbol.*; import ghidra.program.model.symbol.*;
@ -127,6 +126,8 @@ public class RttiUtil {
public static int getVfTableCount(Program program, Address vfTableBaseAddress) { public static int getVfTableCount(Program program, Address vfTableBaseAddress) {
Memory memory = program.getMemory(); Memory memory = program.getMemory();
ReferenceManager referenceManager = program.getReferenceManager();
FunctionManager functionManager = program.getFunctionManager();
MemoryBlock textBlock = memory.getBlock(".text"); MemoryBlock textBlock = memory.getBlock(".text");
MemoryBlock nepBlock = memory.getBlock(".nep"); MemoryBlock nepBlock = memory.getBlock(".nep");
AddressSetView initializedAddresses = memory.getLoadedAndInitializedAddressSet(); AddressSetView initializedAddresses = memory.getLoadedAndInitializedAddressSet();
@ -162,11 +163,14 @@ public class RttiUtil {
} }
// any references after the first one ends the table // any references after the first one ends the table
if (tableSize > 0 && program.getReferenceManager().hasReferencesTo(currentVfPointerAddress)) { if (tableSize > 0 && referenceManager.hasReferencesTo(currentVfPointerAddress)) {
break; break;
} }
if (!pseudoDisassembler.isValidSubroutine(referencedAddress, true, false)) { Function function = functionManager.getFunctionAt(referencedAddress);
if (function == null &&
!pseudoDisassembler.isValidSubroutine(referencedAddress, true, false)) {
break; // Not pointing to possible function. break; // Not pointing to possible function.
} }