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

[Samuel Mehrbrodt (via logerrit)]

 vcl/source/treelist/treelist.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d22dc69d7c8f9134457c18303950d65ae5b0db31
Author:     Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Wed Jun 15 16:54:55 2022 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Jun 16 09:54:33 2022 +0200

    Make sure pEntry is not null
    
    Crash seen:
    >       mergedlo.dll!SvTreeList::GetDepth(const SvTreeListEntry * pEntry) 
line 106
            mergedlo.dll!SalInstanceTreeView::get_iter_depth(const 
weld::TreeIter & rIter) line 4230
            basctllo.dll!basctl::SbTreeListBox::FindVariable(const 
weld::TreeIter * pEntry) line 271
            basctllo.dll!basctl::SbTreeListBox::FindModule(const weld::TreeIter 
* pEntry) line 695
            basctllo.dll!basctl::MacroChooser::BasicSelectHdl(weld::TreeView & 
__formal) line 473
            basctllo.dll!basctl::MacroChooser::RestoreMacroDescription() line 
158
            basctllo.dll!basctl::MacroChooser::run() line 178
    
    Change-Id: Ic85758c0bbee952d0a23b1d52e8bbdd231e8de26
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135914
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
    (cherry picked from commit 21747f8ef471080817db464a91ef203813e84677)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135938
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx
index 9c111bf99893..54ebcb075e92 100644
--- a/vcl/source/treelist/treelist.cxx
+++ b/vcl/source/treelist/treelist.cxx
@@ -103,7 +103,7 @@ sal_uInt16 SvTreeList::GetDepth( const SvTreeListEntry* 
pEntry ) const
 {
     DBG_ASSERT(pEntry && pEntry!=pRootItem.get(),"GetDepth:Bad Entry");
     sal_uInt16 nDepth = 0;
-    while( pEntry->pParent != pRootItem.get() )
+    while( pEntry && pEntry->pParent != pRootItem.get() )
     {
         nDepth++;
         pEntry = pEntry->pParent;