Apache Lucene open-source search software
LUCENE-10607: Fix potential integer overflow in maxArcs computions (#970)
tang donghai2da9951f23af
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex 66d0924a870..c28539cbdd6 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -122,6 +122,8 @@ Bug Fixes* LUCENE-10611: Fix failure when KnnVectorQuery has very selective filter (Kaival Parikh)+* LUCENE-10607: Fix potential integer overflow in maxArcs computions (Tang Donghai)+Other---------------------diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggesterBuilder.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggesterBuilder.javaindex 9123ab75528..3a8c2ed77a0 100644--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggesterBuilder.java+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggesterBuilder.java@@ -124,11 +124,15 @@ final class NRTSuggesterBuilder {* <p>TODO: is there a better way to make the fst built to be more TopNSearcher friendly?*/private static int maxNumArcsForDedupByte(int currentNumDedupBytes) {- int maxArcs = 1 + (2 * currentNumDedupBytes);+ long maxArcs = 2 * (long) currentNumDedupBytes + 1;+ // return immediately when maxArcs is greater than 255 to prevent integer overflow+ if (maxArcs >= 255) {+ return 255;+ }if (currentNumDedupBytes > 5) {maxArcs *= currentNumDedupBytes;}- return Math.min(maxArcs, 255);+ return (int) Math.min(maxArcs, 255);}private static final class Entry implements Comparable<Entry> {