[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - hwpfilter/source

[Caolán McNamara (via logerrit)]

 hwpfilter/source/hbox.cxx |    7 +++++++
 hwpfilter/source/hbox.h   |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 9da4ddff332582175f28a1fddb94ed4c07ab13ec
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Feb 26 16:10:09 2022 +0000
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Feb 28 11:46:01 2022 +0100

    ofz#44991 Use-of-uninitialized-value
    
    Change-Id: I0e3bcce489b665bac3e470e743394935a2ba3a18
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130558
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index 6bbf6d22448b..f9c1542b7cab 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -107,6 +107,8 @@ DateFormat::DateFormat()
 // date code(8)
 DateCode::DateCode()
     : HBox(CH_DATE_CODE)
+    , format{0}
+    , date{0}
     , dummy(0)
     , key(0)
 {
@@ -344,6 +346,7 @@ TxtBox::~TxtBox()
 
 Picture::Picture()
     : FBox(CH_PICTURE)
+    , reserved{0}
     , dummy(0)
     , follow_block_size(0)
     , dummy1(0)
@@ -352,6 +355,10 @@ Picture::Picture()
     , cap_pos(0)
     , num(0)
     , pictype(0)
+    , skip{0}
+    , scale{0}
+    , picinfo{}
+    , reserved3{0}
     , ishyper(false)
 {
 }
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index 869fedd8ba90..afc208f956e0 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -617,7 +617,7 @@ struct Picture: public FBox
  * Ratio of magnification or reduction.
  */
     hunit     scale[2];
-    PicDef    picinfo = {};
+    PicDef    picinfo;
     char      reserved3[9];
 
     std::vector<std::unique_ptr<HWPPara>> caption;