sc/qa/unit/ucalc_pivottable.cxx | 3 ++- sfx2/source/dialog/tabdlg.cxx | 2 +- sw/source/core/txtnode/ndtxt.cxx | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 4dce503b2777e589d713f0fca2604a9a7916813b Author: Caolán McNamara <[email protected]> Date: Thu Mar 19 16:56:23 2015 +0000 coverity#1288895 Explicit null dereferenced Change-Id: I3b8fe2e1aec18b41b1d4553bca0fa6c52d5cfde6 diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index cdb6a1b..4cea451 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -1355,7 +1355,7 @@ void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet ) delete pSet; pSet = pInSet ? new SfxItemSet(*pInSet) : 0; - if ( !bSet && !pExampleSet && !pOutSet ) + if (!bSet && !pExampleSet && !pOutSet && pSet) { pExampleSet = new SfxItemSet( *pSet ); pOutSet = new SfxItemSet( *pSet->GetPool(), pSet->GetRanges() ); commit 3f6589a649cf6d411391409c3ed637e6b641ba80 Author: Caolán McNamara <[email protected]> Date: Thu Mar 19 16:53:22 2015 +0000 coverity#1288894 Dereference after null check, golden regression from commit 553a058ec877e5ea858dbc47eec456033a6323ab Date: Sat Mar 14 20:43:43 2015 +0100 core: dont use 'shortcut' that is longer than the original Change-Id: I0154e484a4f4d6ce6672ddf35d1869157a61f71e Change-Id: I4159a5caf492900bcfb863bc0bc5cf59a47a311c diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 924c117..c630288 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -312,7 +312,8 @@ static void lcl_ChangeFtnRef( SwTxtNode &rNode ) { if( !pFrm ) { - if(!SwIterator<SwCntntFrm,SwTxtNode>( rNode ).First()) + pFrm = SwIterator<SwCntntFrm,SwTxtNode>(rNode).First(); + if (!pFrm) return; } SwTxtFtn *pAttr = static_cast<SwTxtFtn*>(pHt); commit 19fd963db6684a69ac13101c056a135d1b96687b Author: Caolán McNamara <[email protected]> Date: Thu Mar 19 16:49:48 2015 +0000 coverity#1209001 Unchecked return value Change-Id: I1d2615ed478417a965ebddb37539ce4697b8e92f diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx index 07b04ca..932efd6 100644 --- a/sc/qa/unit/ucalc_pivottable.cxx +++ b/sc/qa/unit/ucalc_pivottable.cxx @@ -2166,7 +2166,8 @@ void Test::testFuncGETPIVOTDATA() pDPObj = createDPFromRange(m_pDoc, aDataRange, aFields, SAL_N_ELEMENTS(aFields), false); } - pDPs->InsertNewTable(pDPObj); + bSuccess = pDPs->InsertNewTable(pDPObj); + CPPUNIT_ASSERT_MESSAGE("InsertNewTable failed", bSuccess); aOutRange = refresh(pDPObj); {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
