[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - dbaccess/source

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/app/AppDetailPageHelper.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 6953b18e20d048abc1330b79fc57c395db00bac3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 17 10:05:44 2021 +0000
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Thu Feb 18 11:26:13 2021 +0100

    Resolves: tdf#140444 return early before null-deref
    
    Change-Id: I85c0d178c3d6e375beb3ad50c4bae9ba0ac29937
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111033
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index cd4d9c6e8b80..0e52b87baf95 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -766,13 +766,15 @@ std::unique_ptr<weld::TreeIter> OAppDetailPageHelper::elementAdded(ElementType _
 {
     std::unique_ptr<weld::TreeIter> xRet;
     DBTreeViewBase* pTreeView = m_aLists[_eType].get();
+    if (!pTreeView)
+        return xRet;
     weld::TreeView& rTreeView = pTreeView->GetWidget();
     rTreeView.make_unsorted();
-    if( _eType == E_TABLE && pTreeView )
+    if (_eType == E_TABLE)
     {
         xRet = static_cast<OTableTreeListBox&>(pTreeView->getListBox()).addedTable( _rName );
     }
-    else if ( pTreeView )
+    else
     {
         std::unique_ptr<weld::TreeIter> xEntry;
         Reference<XChild> xChild(_rObject,UNO_QUERY);