Fixes an off by one error in getting location in withinclause (#500)

Hit in particular when the match extends to the end of the file.
microsoft · Aug 11, 2022 · bf9bb5f · bf9bb5f
1 parent d7bf96f
commit bf9bb5f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/AppInspector.RulesEngine/OatExtensions/WithinOperation.cs b/AppInspector.RulesEngine/OatExtensions/WithinOperation.cs
@@ -58,7 +58,7 @@ public OperationResult WithinOperationDelegate(Clause c, object? state1, object?
                                 if (wc.SameLineOnly)
                                 {
                                     var startInner = tc.LineStarts[tc.GetLocation(boundary.Index).Line];
-                                    var endInner = tc.LineEnds[tc.GetLocation(startInner + boundary.Length).Line];
+                                    var endInner = tc.LineEnds[tc.GetLocation(startInner + (boundary.Length - 1)).Line];
                                     return new Boundary()
                                     {
                                         Index = startInner,
@@ -72,12 +72,11 @@ public OperationResult WithinOperationDelegate(Clause c, object? state1, object?
                                     // Before is already a negative number
                                     var startInner = tc.LineStarts[Math.Max(1, startLine + wc.Before)];
                                     var endInner = tc.LineEnds[Math.Min(tc.LineEnds.Count - 1, startLine + wc.After)];
-                                    var bound = new Boundary()
+                                    return new Boundary()
                                     {
                                         Index = startInner,
                                         Length = (endInner - startInner) + 1
                                     };
-                                    return bound;
                                 }
 
                                 if (wc.SameFile)