Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-7408 - Updated the Find Enums action to not truncate long values

dragonmacherb02ff9a98e77
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/FindEnumsByValueAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/FindEnumsByValueAction.java
index bda2173326..69a4b11107 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/FindEnumsByValueAction.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/FindEnumsByValueAction.java
@@ -98,11 +98,10 @@ public class FindEnumsByValueAction extends DockingAction {
OffsetIterator it = new OffsetIterator(enuum);
for (Long value : CollectionUtils.asIterable(it)) {
for (Range range : offsets) {
- int offset = value.intValue();
- if (range.contains(offset)) {
+ if (range.contains(value)) {
return true;
}
- if (offset < range.min) {
+ if (value < range.min) {
// ranges are ascending sorted order; the enum value is already
// smaller than this range, so no more ranges can match
break;
diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/SortedRangeList.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/SortedRangeList.java
index 5f3403b3f3..c3e46ddd12 100644
--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/SortedRangeList.java
+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/SortedRangeList.java
@@ -57,7 +57,7 @@ public class SortedRangeList implements Iterable<Range> {
SortedSet<Range> headSet = set.headSet(key);
if (!headSet.isEmpty()) {
Range last = headSet.last();
- if (min <= (long) last.max + 1) {
+ if (min <= last.max + 1) {
last.max = Math.max(last.max, max);
coalesce(last, set.tailSet(key).iterator());
return;
@@ -70,7 +70,7 @@ public class SortedRangeList implements Iterable<Range> {
}
Iterator<Range> it = ss.iterator();
Range first = it.next();
- if (max < (long) first.min - 1) {
+ if (max < first.min - 1) {
set.add(new Range(min, max));
return;
}
@@ -200,7 +200,7 @@ public class SortedRangeList implements Iterable<Range> {
void coalesce(Range range, Iterator<Range> it) {
while (it.hasNext()) {
Range next = it.next();
- if (next.min > (long) range.max + 1) {
+ if (next.min > range.max + 1) {
break;
}
range.max = Math.max(range.max, next.max);
diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/util/datastruct/Range.java b/Ghidra/Framework/Utility/src/main/java/ghidra/util/datastruct/Range.java
index 3c449d77bb..e76c981b8c 100644
--- a/Ghidra/Framework/Utility/src/main/java/ghidra/util/datastruct/Range.java
+++ b/Ghidra/Framework/Utility/src/main/java/ghidra/util/datastruct/Range.java
@@ -21,7 +21,7 @@ import java.util.stream.LongStream;
import ghidra.util.exception.AssertException;
/**
- * A class for holding a minimum and maximum signed int values that define a range.
+ * A class for holding a minimum and maximum signed long values that define a range.
*/
public class Range implements Comparable<Range>, Iterable<Long> {
/** The range's minimum extent. */