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

GP-0 fix DWARF NPEs when missing regmapping info

Browse source
This commit is contained in:
dev747368 2025-02-05 21:36:44 +00:00
parent 5b818293dc
commit d7ed3a1d35
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFVariable.java
View file

@ -373,8 +373,10 @@ public class DWARFVariable {
return false;
}
type = prog.getDwarfDTM().getPtrTo(type);
setRegisterStorage(List.of(exprEvaluator.getLastRegister()));
if (exprEvaluator.getLastRegister() != null) {
type = prog.getDwarfDTM().getPtrTo(type);
setRegisterStorage(List.of(exprEvaluator.getLastRegister()));
}
}
else if (exprEvaluator.isStackRelative()) {
if (exprEvaluator.isDeref()) {

8
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/funcfixup/StorageVerificationDWARFFunctionFixup.java
View file

@ -15,9 +15,8 @@
*/
package ghidra.app.util.bin.format.dwarf.funcfixup;
import ghidra.app.util.bin.format.dwarf.DWARFFunction;
import ghidra.app.util.bin.format.dwarf.*;
import ghidra.app.util.bin.format.dwarf.DWARFFunction.CommitMode;
import ghidra.app.util.bin.format.dwarf.DWARFVariable;
import ghidra.util.classfinder.ExtensionPointProperties;
/**
@ -32,10 +31,11 @@ public class StorageVerificationDWARFFunctionFixup implements DWARFFunctionFixup
@Override
public void fixupDWARFFunction(DWARFFunction dfunc) {
DWARFRegisterMappings regMappings = dfunc.getProgram().getRegisterMappings();
boolean ignoreStorage = dfunc.getProgram().getImportOptions().isIgnoreParamStorage() ||
dfunc.getProgram().getRegisterMappings().isUseFormalParameterStorage();
(regMappings != null && regMappings.isUseFormalParameterStorage());
boolean isEmptySignature = dfunc.params.isEmpty() && dfunc.retval.isVoidType();
if (ignoreStorage || isEmptySignature) {
if (regMappings == null || ignoreStorage || isEmptySignature) {
dfunc.signatureCommitMode = CommitMode.FORMAL;
return;
}