Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix remaining coverity issues in MantidPlot/Graph (+ new cppcheck 1.68 issues) #380

Merged
merged 4 commits into from
Mar 11, 2015
Merged

Fix remaining coverity issues in MantidPlot/Graph (+ new cppcheck 1.68 issues) #380

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03ae318
fix cppcheck 1.68 issues (postfixOperator perf) in Graph, re #11323
FedeMPouzols Mar 11, 2015
080e98a
fix coverity issue 1075813, potential null deref, re #11323
FedeMPouzols Mar 11, 2015
b9d77ed
fix coverity issue 1075810, dynamic_cast, re #11323
FedeMPouzols Mar 11, 2015
c2cac00
fix coverity issue 1075798, null deref, re #11323
FedeMPouzols Mar 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
56 changes: 30 additions & 26 deletions Code/Mantid/MantidPlot/src/Graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -3653,7 +3655,7 @@ void Graph::restoreFunction(const QStringList& lst)
double start = 0.0, end = 0.0;

QStringList::const_iterator line = lst.begin();
for (line++; line != lst.end(); ++line){
for (++line; line != lst.end(); ++line){
QString s = *line;
if (s.contains("<Type>"))
type = (FunctionCurve::FunctionType)s.remove("<Type>").remove("</Type>").stripWhiteSpace().toInt();
Expand Down Expand Up @@ -3689,7 +3691,7 @@ void Graph::restoreFunction(const QStringList& lst)
c_keys[n_curves-1] = d_plot->insertCurve(c);

QStringList l;
for (line++; line != lst.end(); ++line)
for (++line; line != lst.end(); ++line)
l << *line;
c->restoreCurveLayout(l);

Expand Down Expand Up @@ -4217,17 +4219,19 @@ void Graph::copy(Graph* g)
}

if (c_type[i] != Box && c_type[i] != ErrorBars){
c->setData(x.data(), y.data(), n);
if (c->type() != Function && c->type() != Pie) {
DataCurve *dc = dynamic_cast<DataCurve*>(c);
if (dc)
dc->clone(cv);
} else if (c->type() == Pie) {
QwtPieCurve *cPie = dynamic_cast<QwtPieCurve*>(c);
if (cPie) {
QwtPieCurve *cvPie = dynamic_cast<QwtPieCurve*>(cv);
if (cvPie)
cPie->clone(cvPie);
if (c) {
c->setData(x.data(), y.data(), n);
if (c->type() != Function && c->type() != Pie) {
DataCurve *dc = dynamic_cast<DataCurve*>(c);
if (dc)
dc->clone(cv);
} else if (c->type() == Pie) {
QwtPieCurve *cPie = dynamic_cast<QwtPieCurve*>(c);
if (cPie) {
QwtPieCurve *cvPie = dynamic_cast<QwtPieCurve*>(cv);
if (cvPie)
cPie->clone(cvPie);
}
}
}
}
Expand Down Expand Up @@ -4749,7 +4753,7 @@ void Graph::restoreCurveLabels(int curveID, const QStringList& lst)
if (s.contains("<column>"))
labelsColumn = s.remove("<column>").remove("</column>").trimmed();

for (line++; line != lst.end(); ++line){
for (++line; line != lst.end(); ++line){
s = *line;
if (s.contains("<color>"))
c->setLabelsColor(QColor(s.remove("<color>").remove("</color>").trimmed()));
Expand Down Expand Up @@ -5089,7 +5093,7 @@ void Graph::setIndexedColors()
continue;

PlotCurve *c = dynamic_cast<PlotCurve*>(it);
if (c->type() == ErrorBars)
if (c && c->type() == ErrorBars)
{
// QtiPlot: ErrorBarsCurve *er = (ErrorBarsCurve *) it;
QwtErrorPlotCurve *er = dynamic_cast<QwtErrorPlotCurve*>(it);
Expand Down