vcl/source/treelist/treelist.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 8d2523f824e377c886621432b208ac420b6bcd14 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Wed Jun 15 16:54:55 2022 +0200 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Thu Jun 16 07:49:29 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 <[email protected]> (cherry picked from commit 79f820b6822f8d3578975a4757b4293728c8c717) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135937 diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx index 07db41b54266..f118e5e35637 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;
