[Libreoffice-commits] core.git: sw/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Fri May 24 07:17:49 UTC 2019


 sw/source/core/doc/docredln.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 81c1b8294da000270f1afa036c7befdc7fbe2091
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri May 24 08:23:22 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri May 24 09:16:35 2019 +0200

    SwRedlineData::m_bAutoFormat was left uninitialized
    
    ...by 28bff4bd3947f442c0aebb92217cd0c7b6a53bda "convert nsRedlineType_t to
    scoped enum", causing an invalid read in SwRedlineData::operator == during
    CppunitTest_sw_uwriter.
    
    Change-Id: I4e124532c84fa19e6e29e6d17ed48e34ccaa4042
    Reviewed-on: https://gerrit.libreoffice.org/72887
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 6a1183a832cc..4e764327ac85 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -938,7 +938,7 @@ bool SwRedlineExtraData_FormattingChanges::operator == ( const SwRedlineExtraDat
 SwRedlineData::SwRedlineData( RedlineType eT, std::size_t nAut )
     : m_pNext( nullptr ), m_pExtraData( nullptr ),
     m_aStamp( DateTime::SYSTEM ),
-    m_eType( eT ), m_nAuthor( nAut ), m_nSeqNo( 0 )
+    m_eType( eT ), m_bAutoFormat(false), m_nAuthor( nAut ), m_nSeqNo( 0 )
 {
     m_aStamp.SetNanoSec( 0 );
 }
@@ -951,6 +951,7 @@ SwRedlineData::SwRedlineData(
     , m_sComment( rCpy.m_sComment )
     , m_aStamp( rCpy.m_aStamp )
     , m_eType( rCpy.m_eType )
+    , m_bAutoFormat(false)
     , m_nAuthor( rCpy.m_nAuthor )
     , m_nSeqNo( rCpy.m_nSeqNo )
 {
@@ -960,7 +961,7 @@ SwRedlineData::SwRedlineData(
 SwRedlineData::SwRedlineData(RedlineType eT, std::size_t nAut, const DateTime& rDT,
     const OUString& rCmnt, SwRedlineData *pNxt)
     : m_pNext(pNxt), m_pExtraData(nullptr), m_sComment(rCmnt), m_aStamp(rDT),
-    m_eType(eT), m_nAuthor(nAut), m_nSeqNo(0)
+    m_eType(eT), m_bAutoFormat(false), m_nAuthor(nAut), m_nSeqNo(0)
 {
 }
 


More information about the Libreoffice-commits mailing list