Ghidra is a software reverse engineering (SRE) framework
Use unsigned comparisons for equality range checks
Sylvester Kaczmarek9f0942466092
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghpatexpress/EqualEquation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghpatexpress/EqualEquation.javaindex 89179b153b..ed37d5e284 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghpatexpress/EqualEquation.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghpatexpress/EqualEquation.java@@ -27,10 +27,7 @@ public class EqualEquation extends ValExpressEquation {}static boolean isValueInRange(long value, long min, long max) {- if (min <= max) {- return value >= min && value <= max;- }- return value >= min || value <= max;+ return Long.compareUnsigned(value, min) >= 0 && Long.compareUnsigned(value, max) <= 0;}@Overridediff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcodeCPort/slghpatexpress/EqualEquationTest.java b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcodeCPort/slghpatexpress/EqualEquationTest.javaindex 05e68f42de..2b6157b70d 100644--- a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcodeCPort/slghpatexpress/EqualEquationTest.java+++ b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcodeCPort/slghpatexpress/EqualEquationTest.java@@ -36,11 +36,12 @@ public class EqualEquationTest {}@Test- public void testWrappedRange() {- assertFalse(EqualEquation.isValueInRange(4, 5, -1));- assertTrue(EqualEquation.isValueInRange(5, 5, -1));- assertTrue(EqualEquation.isValueInRange(Long.MAX_VALUE, 5, -1));- assertTrue(EqualEquation.isValueInRange(Long.MIN_VALUE, 5, -1));- assertTrue(EqualEquation.isValueInRange(-1, 5, -1));+ public void testUnsignedRangeCrossingSignedBoundary() {+ assertFalse(EqualEquation.isValueInRange(4, 5, -2));+ assertTrue(EqualEquation.isValueInRange(5, 5, -2));+ assertTrue(EqualEquation.isValueInRange(Long.MAX_VALUE, 5, -2));+ assertTrue(EqualEquation.isValueInRange(Long.MIN_VALUE, 5, -2));+ assertTrue(EqualEquation.isValueInRange(-2, 5, -2));+ assertFalse(EqualEquation.isValueInRange(-1, 5, -2));}}