From 38135836893c1ba574e5addd35588f765677296d Mon Sep 17 00:00:00 2001 From: nicolaas Date: Mon, 10 Jun 2019 16:17:53 -0700 Subject: [PATCH 1/3] Fix equals method in VarnodeAST --- .../src/main/java/ghidra/program/model/pcode/VarnodeAST.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java index f2713a7e36..2541f31467 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java @@ -223,7 +223,7 @@ public class VarnodeAST extends Varnode { if (isInput() != vn.isInput()) return false; if (def != null) - return (def.getSeqnum() == vn.getDef().getSeqnum()); + return (def.getSeqnum().equals(vn.getDef().getSeqnum())); return true; } From f15798ccf96dd9963434b13ed1e386eafb8701e1 Mon Sep 17 00:00:00 2001 From: nicolaas Date: Fri, 21 Jun 2019 11:07:52 -0700 Subject: [PATCH 2/3] Add null check for def of other VarnodeAST in equals method --- .../main/java/ghidra/program/model/pcode/VarnodeAST.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java index 2541f31467..8a837809e4 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java @@ -222,8 +222,12 @@ public class VarnodeAST extends Varnode { return false; if (isInput() != vn.isInput()) return false; - if (def != null) - return (def.getSeqnum().equals(vn.getDef().getSeqnum())); + if (def != null) { + PcodeOp vnDef = vn.getDef(); + if (vnDef == null) + return false; + return (def.getSeqnum().equals(vnDef.getSeqnum())); + } return true; } From 58a9404636c6f18832545916dcc218b5f093a6e7 Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Wed, 26 Jun 2019 09:20:47 -0400 Subject: [PATCH 3/3] GT-2959 (closes #677): certifying Pulled-from: nicolaas