BsDiff.Search is no longer recursive (possible StackOverflowException)

jzebedee · Oct 21, 2014 · 24bc904 · 24bc904
1 parent 81bffcd
commit 24bc904
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/deltaq/BsDiff.cs b/deltaq/BsDiff.cs
@@ -225,25 +225,32 @@ private static int MatchLength(IList<byte> oldData, IList<byte> newData)
 
         private static int Search(IList<int> I, byte[] oldData, IList<byte> newData, int start, int end, out int pos)
         {
-            if (end - start < 2)
+            while (true)
             {
-                var startLength = MatchLength(oldData.Slice(I[start]), newData);
-                var endLength = MatchLength(oldData.Slice(I[end]), newData);
+                if (end - start < 2)
+                {
+                    var startLength = MatchLength(oldData.Slice(I[start]), newData);
+                    var endLength = MatchLength(oldData.Slice(I[end]), newData);
+
+                    if (startLength > endLength)
+                    {
+                        pos = I[start];
+                        return startLength;
+                    }
 
-                if (startLength > endLength)
+                    pos = I[end];
+                    return endLength;
+                }
+
+                var midPoint = start + (end - start) / 2;
+                if (CompareBytes(oldData.Slice(I[midPoint]), newData) < 0)
                 {
-                    pos = I[start];
-                    return startLength;
+                    start = midPoint;
+                    continue;
                 }
 
-                pos = I[end];
-                return endLength;
+                end = midPoint;
             }
-
-            var midPoint = start + (end - start) / 2;
-            return CompareBytes(oldData.Slice(I[midPoint]), newData) < 0 ?
-                Search(I, oldData, newData, midPoint, end, out pos) :
-                Search(I, oldData, newData, start, midPoint, out pos);
         }
     }
 }