diffbot
diff --git a/‎.idea/misc.xml‎
Lines changed: 7 additions & 3 deletions b/‎.idea/misc.xml‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎VERSION-TODO.md‎
Lines changed: 6 additions & 0 deletions b/‎VERSION-TODO.md‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎flexmark-util-sequence/src/main/java/com/vladsch/flexmark/util/sequence/Escaping.java‎
Lines changed: 6 additions & 5 deletions b/‎flexmark-util-sequence/src/main/java/com/vladsch/flexmark/util/sequence/Escaping.java‎
Lines changed: 6 additions & 5 deletions
@@ -7,6 +7,7 @@
 - [Release 0.60.0](#release-0600)
   - [API Refactoring](#api-refactoring)
 - [Next 0.61.xx](#next-061xx)
+- [0.61.16](#06116)
 - [0.61.14](#06114)
 - [0.61.12](#06112)
 - [0.61.10](#06110)
@@ -219,6 +220,11 @@ Please give feedback on the upcoming changes if you have concerns about breaking
 * [ ] Fix: Html converter to not add spaces between end of inline marker and next punctuation:
       `.,:;`
 
+## 0.61.16
+
+* Fix: add range limit to `Escaping.replaceAll(Pattern, BasedSequence, List<Range>, Replacer,
+  ReplacedTextMapper)` when setting matcher range.
+
 ## 0.61.14
 
 * Fix: [#398, Autolinks get cut off if they contain \`&amp;\` (escaped query params)] for
 
@@ -696,7 +696,6 @@ private static BasedSequence replaceAll(Pattern p, @NotNull BasedSequence s, int
         return textMapper.getReplacedSequence();
     }
 
-
     @NotNull
     private static BasedSequence replaceAll(Pattern p, @NotNull BasedSequence s, @NotNull List<Range> ranges, @NotNull Replacer replacer, @NotNull ReplacedTextMapper textMapper) {
         Matcher matcher = p.matcher(s);
@@ -709,15 +708,17 @@ private static BasedSequence replaceAll(Pattern p, @NotNull BasedSequence s, @No
         int lastEnd = 0;
 
         for (Range range : ranges) {
-            matcher.region(range.getStart(), range.getEnd());
-            
+            int start = Utils.rangeLimit(range.getStart(), 0, s.length());
+            int end = Utils.rangeLimit(range.getEnd(), start, s.length());
+            matcher.region(start, end);
+
             while (matcher.find()) {
                 textMapper.addOriginalText(lastEnd, matcher.start());
                 replacer.replace(s, matcher.start(), matcher.end(), textMapper);
                 lastEnd = matcher.end();
-            };
+            }
         }
-            
+
         if (lastEnd < s.length()) {
             textMapper.addOriginalText(lastEnd, s.length());
         }