mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#1398581 Dereference after null check

Browse Source 
and

coverity#1398582 Dereference after null check

Change-Id: I6cbf11c30aac3e9dd7eb0727063a79369fb3e059
This commit is contained in:
Caolán McNamara
2017-01-14 11:24:21 +00:00
parent d7e2830005
commit 08a8174d17
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sc/source/core/data/dptabres.cxx
View File

@@ -2609,11 +2609,11 @@ void ScDPDataMember::UpdateRunningTotals(
{ {
double nTotal; double nTotal;
if ( eRefType == sheet::DataPilotFieldReferenceType::ROW_PERCENTAGE ) if ( eRefType == sheet::DataPilotFieldReferenceType::ROW_PERCENTAGE )
nTotal = pRowTotalData->GetAuxiliary(); nTotal = pRowTotalData ? pRowTotalData->GetAuxiliary() : 0.0;
else if ( eRefType == sheet::DataPilotFieldReferenceType::COLUMN_PERCENTAGE ) else if ( eRefType == sheet::DataPilotFieldReferenceType::COLUMN_PERCENTAGE )
nTotal = pColTotalData->GetAuxiliary(); nTotal = pColTotalData ? pColTotalData->GetAuxiliary() : 0.0;
else else
nTotal = pGrandTotalData->GetAuxiliary(); nTotal = pGrandTotalData ? pGrandTotalData->GetAuxiliary() : 0.0;
if ( nTotal == 0.0 ) if ( nTotal == 0.0 )
pAggData->SetError(); pAggData->SetError();
@@ -2623,9 +2623,9 @@ void ScDPDataMember::UpdateRunningTotals(
break; break;
case sheet::DataPilotFieldReferenceType::INDEX: case sheet::DataPilotFieldReferenceType::INDEX:
{ {
double nColTotal = pColTotalData->GetAuxiliary(); double nColTotal = pColTotalData ? pColTotalData->GetAuxiliary() : 0.0;
double nRowTotal = pRowTotalData->GetAuxiliary(); double nRowTotal = pRowTotalData ? pRowTotalData->GetAuxiliary() : 0.0;
double nGrandTotal = pGrandTotalData->GetAuxiliary(); double nGrandTotal = pGrandTotalData ? pGrandTotalData->GetAuxiliary() : 0.0;
if ( nRowTotal == 0.0 || nColTotal == 0.0 ) if ( nRowTotal == 0.0 || nColTotal == 0.0 )
pAggData->SetError(); pAggData->SetError();
else else