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

Caolán McNamara caolanm at redhat.com
Fri Mar 7 09:17:48 PST 2014


 hwpfilter/source/hwpread.cxx       |    6 +++++-
 sw/source/core/layout/paintfrm.cxx |    2 +-
 sw/source/filter/ww8/ww8par2.cxx   |    3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 31d608a87bb28a81bd5c129d473c8b7211d67098
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 7 17:17:06 2014 +0000

    coverity#707910 Uninitialized scalar field
    
    Change-Id: I991261053026d931bccb3a1429ccfcac136cfd94

diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 42d4be0..1077c6d 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -616,7 +616,11 @@ bool AutoNum::Read(HWPFile & hwpf)
 
 
 // new number(19)
-NewNum::NewNum():HBox(CH_NEW_NUM)
+NewNum::NewNum()
+    : HBox(CH_NEW_NUM)
+    , type(0)
+    , number(0)
+    , dummy(0)
 {
 }
 
commit a6c7a43e1eb8bc5efc94422ffcab108e8f7cbd46
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 7 17:11:15 2014 +0000

    coverity#1078550 Dereference after null check
    
    Change-Id: I51852cba8b061f3b1dee4875f8daf0e0205e2211

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 4d89649..4a77e67 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -936,9 +936,10 @@ void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13)
 
     bAnl = true;
 
+    sNumRule = pNumRule ? pNumRule->GetName() : OUString();
     // set NumRules via stack
     pCtrlStck->NewAttr(*pPaM->GetPoint(),
-        SfxStringItem(RES_FLTR_NUMRULE, pNumRule->GetName()));
+        SfxStringItem(RES_FLTR_NUMRULE, sNumRule));
 
     maANLDRules.SetNumRule(pNumRule, nWwNumType);
 }
commit c0bb06995b7f83cd5ae54ee2219d410a66b11e5c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 7 17:07:56 2014 +0000

    coverity#1130357 Dereference after null check
    
    Change-Id: I6b4735134bb9910fbad3cd4696b159f9f6d93df7

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 097a025..1793307 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5886,7 +5886,7 @@ sal_Bool SwPageFrm::IsLeftShadowNeeded() const
                                                 bool bPaintRightShadow,
                                                 bool bRightSidebar )
 {
-    const SwPostItMgr *pMgr = _pViewShell ? _pViewShell->GetPostItMgr() : 0;
+    const SwPostItMgr *pMgr = _pViewShell->GetPostItMgr();
     SwRect aAlignedPageRect( _rPageRect );
     ::SwAlignRect( aAlignedPageRect, _pViewShell );
     SwRect aPagePxRect =


More information about the Libreoffice-commits mailing list