Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-7058 Fix COPY path

caheckmanb1cb6573ba72
diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/condexe.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/condexe.cc
index 97d7459eeb..67a01dee3a 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/condexe.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/condexe.cc
@@ -244,13 +244,13 @@ Varnode *ConditionalExecution::resolveIblockRead(PcodeOp *op,int4 inbranch)
{
if (op->code() == CPUI_COPY) {
Varnode *vn = op->getIn(0);
- if (vn->isWritten()) {
- PcodeOp *defOp = vn->getDef();
- if (defOp->code() == CPUI_MULTIEQUAL && defOp->getParent() == iblock)
- op = defOp;
- }
- else
+ if (!vn->isWritten())
return vn;
+ PcodeOp *defOp = vn->getDef();
+ if (defOp->code() == CPUI_MULTIEQUAL && defOp->getParent() == iblock)
+ op = defOp;
+ else
+ return vn; // We know defOp is not in iblock
}
OpCode opc = op->code();
if (opc == CPUI_MULTIEQUAL)