Skip to content

Apache Lucene open-source search software

Fix NPE in RoaringDocIdSet.Iterator#intoBitSet (#16252)

venkateshwaran shanmughamcd87d56dd43c
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 250c3d1d04b..d1ef8dce73c 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -605,6 +605,9 @@ Bug Fixes
* GITHUB#16179: Fix minor lock/unlock acquisition order in DocumentsWriterDeleteQueue (Chris Hegarty)
+* GITHUB#16250: Fix NullPointerException in RoaringDocIdSet#intoBitSet when the iterator is already
+ exhausted. (Venkateshwaran Shanmugham)
+
Other
---------------------
* GITHUB#15586: Document that scoring and ranking may change across major Lucene versions, and that applications requiring stable ranking should explicitly configure Similarity. (Parveen Saini)
diff --git a/lucene/core/src/java/org/apache/lucene/util/RoaringDocIdSet.java b/lucene/core/src/java/org/apache/lucene/util/RoaringDocIdSet.java
index 04b74aa002e..4a044a836df 100644
--- a/lucene/core/src/java/org/apache/lucene/util/RoaringDocIdSet.java
+++ b/lucene/core/src/java/org/apache/lucene/util/RoaringDocIdSet.java
@@ -454,6 +454,9 @@ public class RoaringDocIdSet extends DocIdSet {
@Override
public void intoBitSet(int upTo, FixedBitSet bitSet, int offset) throws IOException {
for (; ; ) {
+ if (doc == NO_MORE_DOCS) {
+ break;
+ }
int subUpto = upTo - (block << 16);
if (subUpto < 0) {
break;
diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java b/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java
index 59e449f8e4c..1d8b8d4db05 100644
--- a/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java
+++ b/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java
@@ -255,4 +255,23 @@ public class TestRoaringDocIdSet extends BaseDocIdSetTestCase<RoaringDocIdSet> {
RoaringDocIdSet.Builder b = new RoaringDocIdSet.Builder(100);
expectThrows(IllegalArgumentException.class, () -> b.add(10, 5));
}
+
+ public void testIntoBitSetWhenExhausted() throws IOException {
+ int maxDoc = 3 << 16; // 3 blocks; docs only in block 0
+ RoaringDocIdSet set = new RoaringDocIdSet.Builder(maxDoc).add(5).add(10).add(20).build();
+
+ DocIdSetIterator it = set.iterator();
+ while (it.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {}
+ FixedBitSet bitSet = new FixedBitSet(maxDoc);
+ it.intoBitSet(maxDoc, bitSet, 0);
+ assertEquals(DocIdSetIterator.NO_MORE_DOCS, it.docID());
+ assertTrue(bitSet.scanIsEmpty());
+
+ it = set.iterator();
+ assertEquals(DocIdSetIterator.NO_MORE_DOCS, it.advance(maxDoc));
+ bitSet = new FixedBitSet(maxDoc);
+ it.intoBitSet(maxDoc, bitSet, 0);
+ assertEquals(DocIdSetIterator.NO_MORE_DOCS, it.docID());
+ assertTrue(bitSet.scanIsEmpty());
+ }
}