mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-688 RTTI Util improved getVftableCount method to not just rely on

Browse Source 
pseudoDissasembler but also check if existing function.
This commit is contained in:
ghidra007
2021-02-12 18:48:37 +00:00
parent bf193467f2
commit 849504cda6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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.program.model.address.Address;
import ghidra.program.model.address.AddressSetView;
import ghidra.program.model.listing.GhidraClass;
import ghidra.program.model.listing.Program;
import ghidra.program.model.listing.*;
import ghidra.program.model.mem.Memory;
import ghidra.program.model.mem.MemoryBlock;
import ghidra.program.model.symbol.*;
@@ -166,7 +165,10 @@ public class RttiUtil {
break;
}
if (!pseudoDisassembler.isValidSubroutine(referencedAddress, true, false)) {
Function function = program.getFunctionManager().getFunctionAt(referencedAddress);
if (function == null &&
!pseudoDisassembler.isValidSubroutine(referencedAddress, true, false)) {
break; // Not pointing to possible function.
}