From 080e98a964d4bd2d49f0ae0f3daba81ae0d40a4c Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 11 Mar 2015 13:10:21 +0000
Subject: [PATCH] fix coverity issue 1075813, potential null deref, re #11323
---
Code/Mantid/MantidPlot/src/Graph.cpp | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/Code/Mantid/MantidPlot/src/Graph.cpp b/Code/Mantid/MantidPlot/src/Graph.cpp
index a70e8d192d0..21715e56d92 100644
--- a/Code/Mantid/MantidPlot/src/Graph.cpp
+++ b/Code/Mantid/MantidPlot/src/Graph.cpp
@@ -2089,17 +2089,19 @@ QString Graph::saveCurveLayout(int index)
}
} else if(style == Box){
BoxCurve *b = static_cast<BoxCurve*>(c);
- s+=QString::number(SymbolBox::symbolIndex(b->maxStyle()))+"\t";
- s+=QString::number(SymbolBox::symbolIndex(b->p99Style()))+"\t";
- s+=QString::number(SymbolBox::symbolIndex(b->meanStyle()))+"\t";
- s+=QString::number(SymbolBox::symbolIndex(b->p1Style()))+"\t";
- s+=QString::number(SymbolBox::symbolIndex(b->minStyle()))+"\t";
- s+=QString::number(b->boxStyle())+"\t";
- s+=QString::number(b->boxWidth())+"\t";
- s+=QString::number(b->boxRangeType())+"\t";
- s+=QString::number(b->boxRange())+"\t";
- s+=QString::number(b->whiskersRangeType())+"\t";
- s+=QString::number(b->whiskersRange())+"\t";
+ if (b) {
+ s+=QString::number(SymbolBox::symbolIndex(b->maxStyle()))+"\t";
+ s+=QString::number(SymbolBox::symbolIndex(b->p99Style()))+"\t";
+ s+=QString::number(SymbolBox::symbolIndex(b->meanStyle()))+"\t";
+ s+=QString::number(SymbolBox::symbolIndex(b->p1Style()))+"\t";
+ s+=QString::number(SymbolBox::symbolIndex(b->minStyle()))+"\t";
+ s+=QString::number(b->boxStyle())+"\t";
+ s+=QString::number(b->boxWidth())+"\t";
+ s+=QString::number(b->boxRangeType())+"\t";
+ s+=QString::number(b->boxRange())+"\t";
+ s+=QString::number(b->whiskersRangeType())+"\t";
+ s+=QString::number(b->whiskersRange())+"\t";
+ }
}
return s;
}
--
GitLab