Apache Lucene open-source search software
Fix integer underflow in assertion in SparseFixedBitSet (#16347)
Alan Woodwardffb86f9bdc20
diff --git a/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.java b/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.javaindex ef32a635d8f..6f3c08ced58 100644--- a/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.java+++ b/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.java@@ -41,12 +41,12 @@ public class SparseFixedBitSet extends BitSet {private static final long SINGLE_ELEMENT_ARRAY_BYTES_USED = RamUsageEstimator.sizeOf(new long[1]);private static final int MASK_4096 = (1 << 12) - 1;- private static int blockCount(int length) {+ static int blockCount(int length) {int blockCount = length >>> 12;if ((blockCount << 12) < length) {++blockCount;}- assert (blockCount << 12) >= length;+ assert ((long) blockCount << 12) >= length;return blockCount;}diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.java b/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.javaindex 2bdefb1e526..b47ff902088 100644--- a/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.java+++ b/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.java@@ -155,4 +155,8 @@ public class TestSparseFixedBitSet extends BaseBitSetTestCase<SparseFixedBitSet>}}}++ public void testLargeValuesDoNotOverflow() {+ assertEquals(524288, SparseFixedBitSet.blockCount(2147479553));+ }}