[Libreoffice-commits] core.git: filter/source include/filter

Tue Sep 14 10:20:03 UTC 2021

filter/source/msfilter/svdfppt.cxx  |    6 +++---
 include/filter/msfilter/svdfppt.hxx |   12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit e71d011a59e12683df25c893bd0b989b5f659d79
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 14 09:23:57 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 14 12:19:28 2021 +0200

    ofz: MemorySanitizer: use-of-uninitialized-value
    
    Change-Id: I5906dc1f9f0295d406c01871e5fed1da0025682f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122081
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index b900fd239b5a..dba0659e6a3d 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -264,9 +264,9 @@ SvStream& ReadPptDocumentAtom(SvStream& rIn, PptDocumentAtom& rAtom)
 //  39 bShowComments     1
 
     DffRecordHeader aHd;
-    sal_Int32   nSlideX,nSlideY, nNoticeX, nNoticeY, nDummy;
-    sal_uInt16  nSlidePageFormat;
-    sal_Int8    nEmbeddedTrueType, nTitlePlaceHoldersOmitted, nRightToLeft, nShowComments;
+    sal_Int32 nSlideX(0), nSlideY(0), nNoticeX(0), nNoticeY(0), nDummy;
+    sal_uInt16 nSlidePageFormat(0);
+    sal_Int8 nEmbeddedTrueType(0), nTitlePlaceHoldersOmitted(0), nRightToLeft(0), nShowComments(0);
 
     ReadDffRecordHeader( rIn, aHd );
     rIn
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index e0aa98e56c29..fbb0896d71d1 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -193,6 +193,18 @@ struct MSFILTER_DLLPUBLIC PptDocumentAtom
 
 public:
 
+    PptDocumentAtom()
+        : nNotesMasterPersist(0)
+        , nHandoutMasterPersist(0)
+        , n1stPageNumber(0)
+        , eSlidesPageFormat(PPTPF_SCREEN)
+        , bEmbeddedTrueType(false)
+        , bTitlePlaceholdersOmitted(false)
+        , bRightToLeft(false)
+        , bShowComments(false)
+    {
+    }
+
     Size const & GetSlidesPageSize() const { return aSlidesPageSize; }
     Size const & GetNotesPageSize() const { return aNotesPageSize; }
 
