[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - desktop/inc desktop/source

[Luboš Luňák (via logerrit)]

 desktop/inc/lib/init.hxx    |    2 +-
 desktop/source/lib/init.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1fe6e08a1bba3a1b981218bbc485c8fa162ba162
Author:     Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Mon Oct 25 21:13:42 2021 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Dec 9 13:24:46 2021 +0100

    make sure vector elements are initialized properly
    
    Change-Id: If18268a26118ea587f474c21b7ca0f1fa4622744
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126442
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 3f3802d17d4e..4499914839a0 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -197,7 +197,7 @@ namespace desktop {
         std::vector<bool> m_updatedTypes; // index is type, value is if set
         struct PerViewIdData
         {
-            bool set; // value is if set
+            bool set = false; // value is if set
             int sourceViewId;
         };
         // Flat_map is used in preference to unordered_map because the map is 
accessed very often.
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 16ffe6f097e7..3bd212195f4d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1505,7 +1505,7 @@ void CallbackFlushHandler::setUpdatedTypePerViewId( int 
nType, int nViewId, int
     assert(isUpdatedTypePerViewId(nType));
     std::vector<PerViewIdData>& types = m_updatedTypesPerViewId[ nViewId ];
     if( types.size() <= o3tl::make_unsigned( nType ))
-        types.resize( nType + 1 ); // new are default-constructed, i.e. false
+        types.resize( nType + 1 ); // new are default-constructed, i.e. 'set' 
is false
     types[ nType ] = PerViewIdData{ value, nSourceViewId };
 }