[Libreoffice-commits] core.git: 2 commits - hwpfilter/source

[Caolán McNamara]

 hwpfilter/source/hbox.cxx |   55 ++++++++++++++++++++++++++++++++++++----------
 hwpfilter/source/hbox.h   |   12 ++++++++++
 2 files changed, 56 insertions(+), 11 deletions(-)

New commits:
commit 82a8c5fd9a85b5b66b2b6f39af0750764066dba3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Apr 26 10:55:39 2014 +0100

    coverity#707891 Uninitialized pointer field
    
    Change-Id: Id717454935e1b9426f59061ed95364bf69408232

diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index ef8a8d4..c3c7eca 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -289,9 +289,7 @@ hchar_string DateCode::GetString()
     return ret;
 }
 
-
 // tab(9)
-
 Tab::Tab()
     : HBox(CH_TAB)
     , width(0)
@@ -300,15 +298,35 @@ Tab::Tab()
 {
 }
 
-
 // floating box
-FBox::FBox(hchar hch):HBox(hch)
+FBox::FBox(hchar hch)
+    : HBox(hch)
+    , zorder(0)
+    , option(0)
+    , ctrl_ch(0)
+    , box_xs(0)
+    , box_ys(0)
+    , cap_xs(0)
+    , cap_ys(0)
+    , xs(0)
+    , ys(0)
+    , cap_margin(0)
+    , xpos_type(0)
+    , ypos_type(0)
+    , smart_linesp(0)
+    , boundsy(0)
+    , boundey(0)
+    , boundx(0)
+    , draw(0)
+    , pgx(0)
+    , pgy(0)
+    , pgno(0)
+    , showpg(0)
+    , prev(NULL)
+    , next(NULL)
 {
-    prev = next = 0;
-     zorder = 0;
 }
 
-
 FBox::~FBox()
 {
 }
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index 32ffa58..c18be55 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -288,6 +288,18 @@ struct FBoxStyle
 
     void *cell;
 
+    FBoxStyle()
+        : anchor_type(0)
+        , txtflow(0)
+        , xpos(0)
+        , ypos(0)
+        , boxnum(0)
+        , boxtype(0)
+        , cap_len(0)
+        , cell(NULL)
+    {
+        memset(margin, 0, sizeof(margin));
+    }
 };
 
 /**
commit 3bdd5bd7a5145b3c5aed744dac221bb1ab119bda
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Apr 26 10:46:54 2014 +0100

    coverity#707892 Uninitialized pointer field
    
    Change-Id: Ic9f477efd34b6baa4d5cd7a75db8187332b7b328

diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index 7b87059..ef8a8d4 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -313,14 +313,29 @@ FBox::~FBox()
 {
 }
 
-
 // tbox(10) TABLE BOX MATH BUTTON HYPERTEXT
-
-TxtBox::TxtBox(void):FBox(CH_TEXT_BOX), cell(0), plists(0)
+TxtBox::TxtBox()
+    : FBox(CH_TEXT_BOX)
+    , dummy(0)
+    , dummy1(0)
+    , cap_len(0)
+    , next(0)
+    , dummy2(0)
+    , reserved1(0)
+    , cap_pos(0)
+    , num(0)
+    , dummy3(0)
+    , baseline(0)
+    , type(0)
+    , nCell(0)
+    , protect(0)
+    , cell(0)
+    , m_pTable(NULL)
+    , plists(NULL)
 {
+    reserved[0] = reserved[1] = 0;
 }
 
-
 TxtBox::~TxtBox(void)
 {
     delete[]cell;