[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d29f057ff03fcbccb81ccbac8d2ae2954ca3daef
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue Dec 14 19:34:36 2021 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed Dec 15 08:39:39 2021 +0100

    tdf#141175 sw_redlinehide: fix crash in lcl_DeleteRedlines()
    
    The GetNext() returns itself if it's alone in the Ring.
    
    (regression from 27aa4b16bf704d0246595750daf57b57ff2577b3)
    
    Change-Id: Idf92ce5362c4a4acf1582f463fe7bafc8553b400
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126844
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 19f2054c6063177d08c818c5b7eeba7ab9178249)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126823
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 8bff2555224a..304f44c77116 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -408,7 +408,8 @@ namespace
                                             *pDelPam->GetPoint(), nDelCount );
                         }
 
-                        if (pDelPam->GetNext() && *pDelPam->GetNext()->End() 
== *pDelPam->Start())
+                        if (pDelPam->GetNext() != pDelPam.get()
+                            && *pDelPam->GetNext()->End() == *pDelPam->Start())
                         {
                             *pDelPam->GetNext()->End() = *pDelPam->End();
                             pDelPam.reset(pDelPam->GetNext());