Port commit 9d10d6f92cc for LUCENE-5660 in Lucene 4.8.1

Author: paulirwin

src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs

@@ -979,7 +979,8 @@ internal ISet<Int32sRef> ToFiniteStrings(BytesRef surfaceForm, TokenStreamToAuto
             ReplaceSep(automaton);
             automaton = ConvertAutomaton(automaton);
 
-            if (Debugging.AssertsEnabled) Debugging.Assert(SpecialOperations.IsFinite(automaton));
+            // TODO: LUCENE-5660 re-enable this once we disallow massive suggestion strings
+            // if (Debugging.AssertsEnabled) Debugging.Assert(SpecialOperations.IsFinite(automaton));
 
             // Get all paths from the automaton (there can be
             // more than one path, eg if the analyzer created a

src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingSuggesterTest.cs

@@ -1499,24 +1499,24 @@ internal static IEnumerable<Input> Shuffle(params Input[] values)
             return asList;
         }
 
-        // LUCENENET TODO: This is a test from Lucene 4.8.1 that currently produces a stack overflow
-        //// TODO: we need BaseSuggesterTestCase?
-        //[Test]
-        //public void TestTooLongSuggestion()
-        //{
-        //    Analyzer a = new MockAnalyzer(Random);
-        //    AnalyzingSuggester suggester = new AnalyzingSuggester(a);
-        //    String bigString = TestUtil.RandomSimpleString(Random, 60000, 60000);
-        //    try
-        //    {
-        //        suggester.Build(new InputArrayEnumerator(new Input[] {
-        //            new Input(bigString, 7)}));
-        //        fail("did not hit expected exception");
-        //    }
-        //    catch (Exception iae) when (iae.IsIllegalArgumentException())
-        //    {
-        //        // expected
-        //    }
-        //}
+        // TODO: we need BaseSuggesterTestCase?
+        [Test]
+        public void TestTooLongSuggestion()
+        {
+            Analyzer a = new MockAnalyzer(Random);
+            AnalyzingSuggester suggester = new AnalyzingSuggester(a);
+            string bigString = TestUtil.RandomSimpleString(Random, 60000, 60000);
+            try
+            {
+                suggester.Build(new InputArrayEnumerator([
+                    new Input(bigString, 7)
+                ]));
+                Assert.Fail("did not hit expected exception");
+            }
+            catch (ArgumentOutOfRangeException /*iae*/) // LUCENENET-specific AOORE for .NET semantics
+            {
+                // expected
+            }
+        }
     }
 }

src/Lucene.Net/Util/OfflineSorter.cs

@@ -670,7 +670,7 @@ public virtual void Write(byte[] bytes)
             /// by the bytes.
             /// </summary>
             /// <exception cref="ArgumentNullException"><paramref name="bytes"/> is <c>null</c>.</exception>
-            /// <exception cref="ArgumentOutOfRangeException"><paramref name="off"/> or <paramref name="len"/> is less than 0.</exception>
+            /// <exception cref="ArgumentOutOfRangeException"><paramref name="off"/> or <paramref name="len"/> is less than 0, or <paramref name="len"/> is greater than <see cref="short.MaxValue"/>.</exception>
             /// <exception cref="ArgumentException"><paramref name="off"/> and <paramref name="len"/> refer to a position outside of the array.</exception>
             public virtual void Write(byte[] bytes, int off, int len)
             {
@@ -683,6 +683,9 @@ public virtual void Write(byte[] bytes, int off, int len)
                 if (off > bytes.Length - len) // Checks for int overflow
                     throw new ArgumentException("Index and length must refer to a location within the array.");
 
+                if (len > short.MaxValue)
+                    throw new ArgumentOutOfRangeException(nameof(len), $"len must be <= {short.MaxValue}; got {len}");
+
                 os.Write((short)len);
                 os.Write(bytes, off, len);
             }