Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-08 03:30:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-2820 corrected getPossibleCalledDestructors NPE

Browse Source
This commit is contained in:
ghidra1 2022-11-10 13:34:58 -05:00
parent 135e96079f
commit d729dd19ca
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java
View File

@ -6786,10 +6786,13 @@ public class RecoveredClassHelper {
// the operator delete or if there is no vftable ref, the call is before
// the operator delete call
Function calledFunction = addressToFunctionCallMap.get(callingAddress);
if (calledFunction.isThunk()) {
calledFunction.getThunkedFunction(true);
if (calledFunction != null) {
if (calledFunction.isThunk()) {
// TODO: should all thunks and real function be returned?
calledFunction.getThunkedFunction(true);
}
possibleCalledDestructorSet.add(calledFunction);
}
possibleCalledDestructorSet.add(calledFunction);
}
List<Function> possibleCalledDestructors =
new ArrayList<Function>(possibleCalledDestructorSet);