[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-0' - sc/source

[Stephan Bergmann]

 sc/source/ui/navipi/navipi.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit e6562425d821b065aa139a86f0534ef2b8896ec5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 11 17:20:02 2018 +0100

    Add back initialization of ScNavigatorSettings::maExpandedVec
    
    ...lost with 2ea92be9973e6892727eae37ae958863702b3658 "convert SC_CONVERT
    constants to scoped enum".  And indeed, e.g., opening the document from
    <https://bugs.documentfoundation.org/show_bug.cgi?id=114932#c2> through steps 1
    and 2 in a UBSan build reports a use of an uninitialized (bad-valued) bool in
    ScNavigatorSettings::IsExpanded.
    
    Change-Id: If0dfadc6bd8033e61e334f59b3028ab005a892cd
    Reviewed-on: https://gerrit.libreoffice.org/47767
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit fbec01b7af438fc7409c875e59be7483772b53a2)
    Reviewed-on: https://gerrit.libreoffice.org/47786
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index b980f8354ebe..e84c61e056dc 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -435,6 +435,7 @@ ScNavigatorSettings::ScNavigatorSettings()
     : mnRootSelected(ScContentId::ROOT)
     , mnChildSelected(SC_CONTENT_NOCHILD)
 {
+    maExpandedVec.fill(false);
 }
 
 SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR )