Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-22 07:53:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GT-1-dragonmacher-npe-action-fix'

Browse Source
This commit is contained in:
ghidravore
2020-08-04 17:13:27 -04:00
parent 3ec58674f5 61e7417a58
commit 8408e836a8
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/OverridePrototypeAction.java
+12 -4
View File
@@ -112,8 +112,7 @@ public class OverridePrototypeAction extends AbstractDecompilerAction {
ClangNode parent = tokenAtCursor.Parent();
if (parent instanceof ClangStatement) {
PcodeOp op = ((ClangStatement) parent).getPcodeOp();
int opCode = op.getOpcode();
if (opCode == PcodeOp.CALL || opCode == PcodeOp.CALLIND) {
if (isCallOp(op)) {
return op;
}
}
@@ -141,8 +140,7 @@ public class OverridePrototypeAction extends AbstractDecompilerAction {
Iterator<PcodeOpAST> iter = hfunc.getPcodeOps(addr);
while (iter.hasNext()) {
PcodeOpAST op = iter.next();
int opCode = op.getOpcode();
if (opCode == PcodeOp.CALL || opCode == PcodeOp.CALLIND) {
if (isCallOp(op)) {
return op;
}
}
@@ -150,6 +148,16 @@ public class OverridePrototypeAction extends AbstractDecompilerAction {
return null;
}
private static boolean isCallOp(PcodeOp op) {
if (op == null) {
return false;
}
int opCode = op.getOpcode();
return opCode == PcodeOp.CALL || opCode == PcodeOp.CALLIND;
}
private Function getCalledFunction(Program program, PcodeOp op) {
if (op.getOpcode() != PcodeOp.CALL) {
return null;