Add an extra check against infinite looping in searchReplaceAll

Coises · Jan 4, 2024 · 4164a07 · 4164a07
1 parent d906974
commit 4164a07
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/Search.cpp b/src/Search.cpp
@@ -1007,6 +1007,7 @@ void ColumnsPlusPlusData::searchReplaceAll(bool partial, bool before) {
         Scintilla::Position nullAt = -1;
         for (Scintilla::Position cpFrom = partialStart, cpTo; cpFrom < partialEnd; cpFrom = cpTo) {
             cpTo = sci.IndicatorEnd(searchData.indicator, cpFrom);
+            if (cpTo <= cpFrom) break; // Safety check against indefinite loop; in principle, this shouldn't happen.
             if (sci.IndicatorValueAt(searchData.indicator, cpFrom)) {
                 Scintilla::Position start = sci.IndicatorStart(searchData.indicator, cpFrom);
                 rx.invalidate();
@@ -1045,6 +1046,7 @@ void ColumnsPlusPlusData::searchReplaceAll(bool partial, bool before) {
         std::string sciFind = prepareFind(*this);
         for (Scintilla::Position cpFrom = partialStart, cpTo; cpFrom < partialEnd; cpFrom = cpTo) {
             cpTo = sci.IndicatorEnd(searchData.indicator, cpFrom);
+            if (cpTo <= cpFrom) break; // Safety check against indefinite loop; in principle, this shouldn't happen.
             if (sci.IndicatorValueAt(searchData.indicator, cpFrom)) {
                 while (cpFrom < cpTo) {
                     sci.SetTargetRange(cpFrom, cpTo);