yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

Corrected full reverse index iteration

Browse source
This commit is contained in:
ghidra1 2019-05-03 14:49:10 -04:00
parent 931b27dff0
commit db2e38e24e
4 changed files with 61 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Ghidra/Framework/DB/src/main/java/db/FieldIndexTable.java
View file

@ -497,7 +497,7 @@ public class FieldIndexTable extends IndexTable {
* @param minValue minimum index value or null if no minimum
* @param maxValue maximum index value or null if no maximum
* @param startValue starting index value.
* @param primaryKey starting primary key value.
* @param primaryKey starting primary key value (ignored if startValue is null).
* @param after if true iterator is positioned immediately after
* the startValue/primaryKey,
* otherwise immediately before.
@ -505,17 +505,26 @@ public class FieldIndexTable extends IndexTable {
*/
PrimaryKeyIterator(Field minValue, Field maxValue, Field startValue, long primaryKey,
boolean after) throws IOException {
min = minValue != null ? IndexField.getIndexField(minValue, Long.MIN_VALUE) : null;
max = maxValue != null ? IndexField.getIndexField(maxValue, Long.MAX_VALUE) : null;
IndexField start =
startValue != null ? IndexField.getIndexField(startValue, primaryKey) : null;
indexIterator = indexTable.fieldKeyIterator(min, max, start);
if (indexIterator.hasNext()) {
Field f = indexIterator.next();
if (!after || !f.equals(start)) {
indexIterator.previous();
IndexField start = null;
if (after && startValue == null && maxValue == null) {
indexIterator = indexTable.fieldKeyIterator(min, max, !after);
if (indexIterator.hasNext()) {
indexIterator.next(); // must step beyond max indexed value
}
}
else {
start =
startValue != null ? IndexField.getIndexField(startValue, primaryKey) : null;
indexIterator = indexTable.fieldKeyIterator(min, max, start);
if (indexIterator.hasNext()) {
Field f = indexIterator.next();
if (!after || !f.equals(start)) {
indexIterator.previous();
}
}
}
}