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

[Caolán McNamara]

 filter/source/graphicfilter/icgm/chart.hxx     |   50 +++++++++++++++++++++----
 filter/source/graphicfilter/itiff/lzwdecom.cxx |   14 +++++--
 filter/source/msfilter/eschesdo.cxx            |   30 ++++++++-------
 3 files changed, 70 insertions(+), 24 deletions(-)

New commits:
commit dfc39fcdbf2ded137d4c40869a5c4473a45a1a6c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 11 20:49:57 2014 +0100

    coverity#707837 Uninitialized scalar field
    
    Change-Id: Icce1d2cd9abfebcf26e916c4c79341b617e97b2e

diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 6c1d7ef..5e0cb08 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -61,22 +61,26 @@ using namespace ::com::sun::star::style;
 #define EES_MAP_FRACTION 1440   // 1440 dpi
 
 ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx )
-        :
-        mpEscherEx              ( &rEx ),
-        maMapModeSrc            ( MAP_100TH_MM ),
-        // PowerPoint: 576 dpi, WinWord: 1440 dpi, Excel: 1440 dpi
-        maMapModeDest( MAP_INCH, Point(), Fraction( 1, EES_MAP_FRACTION ), Fraction( 1, EES_MAP_FRACTION ) ),
-        mpPicStrm               ( NULL ),
-        mpHostAppData           ( NULL ),
-        mnPagesWritten          ( 0 ),
-        mnShapeMasterTitle      ( 0 ),
-        mnShapeMasterBody       ( 0 ),
-        mbStatusIndicator       ( sal_False ),
-        mbStatus                ( sal_False )
+    : mpEscherEx(&rEx)
+    , maMapModeSrc(MAP_100TH_MM)
+    // PowerPoint: 576 dpi, WinWord: 1440 dpi, Excel: 1440 dpi
+    , maMapModeDest( MAP_INCH, Point(), Fraction( 1, EES_MAP_FRACTION ), Fraction( 1, EES_MAP_FRACTION ) )
+    , mpPicStrm(NULL)
+    , mpHostAppData(NULL)
+    , mnPagesWritten(0)
+    , mnShapeMasterTitle(0)
+    , mnShapeMasterBody(0)
+    , mnIndices(0)
+    , mnOutlinerCount(0)
+    , mnPrevTextStyle(0)
+    , mnStatMaxValue(0)
+    , mnEffectCount(0)
+    , mbIsTitlePossible(false)
+    , mbStatusIndicator(false)
+    , mbStatus(false)
 {
 }
 
-
 Point ImplEESdrWriter::ImplMapPoint( const Point& rPoint )
 {
     return OutputDevice::LogicToLogic( rPoint, maMapModeSrc, maMapModeDest );
commit 2c2b3a16bd34408000a8c623a2de764c698a7291
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 11 20:45:09 2014 +0100

    coverity#707834 Uninitialized scalar field
    
    Change-Id: I405b981c9234a662cf1d305ad437482d10cbf432

diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx b/filter/source/graphicfilter/itiff/lzwdecom.cxx
index 0d7970d..cb8abaa 100644
--- a/filter/source/graphicfilter/itiff/lzwdecom.cxx
+++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx
@@ -23,7 +23,16 @@
 #define MAX_TABLE_SIZE 4096
 
 LZWDecompressor::LZWDecompressor()
-    : pOutBufData(NULL)
+    : pIStream(NULL)
+    , nTableSize(0)
+    , bEOIFound(false)
+    , bInvert(false)
+    , bFirst(true)
+    , nOldCode(0)
+    , pOutBufData(NULL)
+    , nOutBufDataLen(0)
+    , nInputBitsBuf(0)
+    , nInputBitsBufSize(0)
 {
     sal_uInt16 i;
 
@@ -35,9 +44,6 @@ LZWDecompressor::LZWDecompressor()
         pTable[i].nDataCount=1;
         pTable[i].nData=(sal_uInt8)i;
     }
-    pIStream=NULL;
-    bFirst = sal_True;
-    nOldCode = 0;
 }
 
 
commit d30ee7f7cefdefd9eb6b5c7763482d4fbcdb6b7c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 11 20:37:10 2014 +0100

    coverity#707812 Uninitialized scalar field
    
    Change-Id: I04e65d6c0124a2f370ae006bbaa991d5e7753e12

diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx
index ca8c190..e91660e 100644
--- a/filter/source/graphicfilter/icgm/chart.hxx
+++ b/filter/source/graphicfilter/icgm/chart.hxx
@@ -91,7 +91,7 @@ typedef struct TextEntry
     TextAttribute*  pAttribute;
 } TextEntry;
 
-typedef struct ZoneOption
+struct ZoneOption
 {
     char            nOverTitle;
     char            nOverBody;
@@ -105,18 +105,43 @@ typedef struct ZoneOption
     char            nFFillc_Title;
     char            nFFillc_Body;
     char            nFFillc_Foot;
-} ZoneOption;
+    ZoneOption()
+        : nOverTitle(0)
+        , nOverBody(0)
+        , nOverFoot(0)
+        , nFStyle_Title(0)
+        , nFStyle_Body(0)
+        , nFStyle_Foot(0)
+        , nFOutc_Title(0)
+        , nFOutc_Body(0)
+        , nFOutc_Foot(0)
+        , nFFillc_Title(0)
+        , nFFillc_Body(0)
+        , nFFillc_Foot(0)
+    {
+    }
+};
 
-typedef struct BulletOption
+struct BulletOption
 {
     char            nBType;
     char            nBSize;
     char            nBColor;
-    sal_Int16           nBStart;
+    sal_Int16       nBStart;
     double          nTMargin;
     double          nBSpace;
     char            nCPlace;
-} BulletOption;
+    BulletOption()
+        : nBType(0)
+        , nBSize(0)
+        , nBColor(0)
+        , nBStart(0)
+        , nTMargin(0)
+        , nBSpace(0)
+        , nCPlace(0)
+    {
+    }
+};
 
 typedef struct BulDef
 {
@@ -131,7 +156,7 @@ typedef struct BulletLines
     BulDef          nBulDef[ 48 ];
 } BulletLines;
 
-typedef struct IntSettings
+struct IntSettings
 {
     sal_uInt16          nCountry;
     sal_uInt16          nDateFormat;
@@ -141,7 +166,18 @@ typedef struct IntSettings
     sal_uInt16          nNumSeps;
     sal_uInt16          nCurrencyFormat;
     char            nCurrencySymbol[ 5 ];
-} IntSettings;
+    IntSettings()
+        : nCountry(0)
+        , nDateFormat(0)
+        , nDateSep(0)
+        , nTimeFormat(0)
+        , nTimeSep(0)
+        , nNumSeps(0)
+        , nCurrencyFormat(0)
+    {
+        memset (nCurrencySymbol, 0, sizeof(nCurrencySymbol));
+    }
+};
 
 typedef struct PageOrientDim
 {