[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/utlui/content.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 18eb7166d18b6ba91e0bb2415f3709ac5b30416d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Nov 22 10:10:27 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Nov 22 12:49:28 2019 +0100

    Resolves: rhbz#1775544 crash in navigator
    
    see demo reproducer in rhbz#1775544 nChildCount is a count of all
    descendants not just direct children.
    
    Just looping while FirstChild returns something is sufficient.
    
    Change-Id: If7b16032731d694bfffaae22faad5fe194d1822f
    Reviewed-on: https://gerrit.libreoffice.org/83455
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 21b72b3a9bcd..a5eb88d677a4 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2268,12 +2268,8 @@ bool SwContentTree::HasContentChanged()
                     }
                     if(bRemoveChildren)
                     {
-                        for(size_t j = 0; j < nChildCount; ++j)
-                        {
-                            SvTreeListEntry *const pRemove = FirstChild(pEntry);
-                            assert(pRemove);
-                            GetModel()->Remove(pRemove);
-                        }
+                        while (SvTreeListEntry *const pRemove = FirstChild(pEntry))
+                            RemoveEntry(pRemove);
                     }
                     if(!nChildCount)
                     {