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

[Caolán McNamara (via logerrit)]

 cui/source/customize/acccfg.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4f7f537bd0be5dbb57790101dce263345d684f1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 5 16:42:34 2020 +0000
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Tue Feb 11 10:36:18 2020 +0100

    Resolves: tdf#130340 null deref when nothing selected
    
    Change-Id: Ie406006cbcca566ddd32fd86a7e88f0c754dd02e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88048
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit 5cbaec2ffd289f6b3e1dce15c00d5b1d3c2f815e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88234
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 24a601d0af99..4bdeaabfd884 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1182,7 +1182,7 @@ IMPL_LINK(SfxAcceleratorConfigPage, SelectHdl, weld::TreeView&, rListBox, void)
         m_xRemoveButton->set_sensitive( false );
         m_xChangeButton->set_sensitive( false );
 
-        if (pEntry->m_bIsConfigurable)
+        if (pEntry && pEntry->m_bIsConfigurable)
         {
             if (pEntry->isConfigured())
                 m_xRemoveButton->set_sensitive(true);