Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 10:25:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-5625 rtti script added some missing null checks

Browse Source
This commit is contained in:
ghidra007
2025-04-28 18:36:37 +00:00
parent 1179fc10a0
commit e4163c60a5
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIGccClassRecoverer.java
+3 -1
View File
@@ -3437,7 +3437,9 @@ public class RTTIGccClassRecoverer extends RTTIClassRecoverer {
Function calledFunction =
extendedFlatAPI.getReferencedFunction(instruction.getMinAddress(), false);
if (calledFunction.getName().equals(expectedCalledFunctionName)) {
if (calledFunction != null &&
calledFunction.getName().equals(expectedCalledFunctionName)) {
return instruction.getAddress();
}
}
Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java
+11
View File
@@ -434,6 +434,10 @@ public class RecoveredClassHelper {
Function calledFunction = extendedFlatAPI
.getReferencedFunction(instruction.getMinAddress(), getThunkedFunction);
if (calledFunction == null) {
continue;
}
// include the null functions in map so things using map can get accurate count
// of number of CALL instructions even if the call reg type
functionCallMap.put(instruction.getMinAddress(), calledFunction);
@@ -2112,6 +2116,10 @@ public class RecoveredClassHelper {
Function constructor =
extendedFlatAPI.getReferencedFunction(constructorReference, true);
if (constructor == null) {
continue;
}
if (recoveredClass.getIndeterminateList().contains(constructor)) {
addConstructorToClass(recoveredClass, constructor);
recoveredClass.removeIndeterminateConstructorOrDestructor(constructor);
@@ -2534,6 +2542,9 @@ public class RecoveredClassHelper {
RecoveredClass recoveredClass = referenceToClassMap.get(destructorReference);
Function destructor = extendedFlatAPI.getReferencedFunction(destructorReference, true);
if (destructor == null) {
continue;
}
if (recoveredClass.getIndeterminateList().contains(destructor)) {
addDestructorToClass(recoveredClass, destructor);