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

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 27badf859389b20d03b96e7459a8110bc48224db
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Feb 18 13:06:56 2020 +0000
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Feb 19 10:55:00 2020 +0100

    Resolves: tdf#130756 null deref in empty treeview
    
    Change-Id: Ie43081d5c1feb655ea1479476375ee7381f0a0ef
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88947
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index e1baf6c61d90..48f960f851c0 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -6035,7 +6035,10 @@ IMPL_LINK(SalInstanceEntryTreeView, KeyPressListener, VclWindowEvent&, rEvent, v
         m_pTreeView->disable_notify_events();
         auto& rListBox = m_pTreeView->getTreeView();
         if (!rListBox.FirstSelected())
-            rListBox.Select(rListBox.First(), true);
+        {
+            if (SvTreeListEntry* pEntry = rListBox.First())
+                rListBox.Select(pEntry, true);
+        }
         else
             rListBox.KeyInput(rKeyEvent);
         m_xEntry->set_text(m_xTreeView->get_selected_text());