dynamic_casts, showAxis(), coverity issue 1075785, re #11152

mantidproject · Feb 22, 2015 · 0ff0f9e · 0ff0f9e
1 parent f769b73
commit 0ff0f9e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Code/Mantid/MantidPlot/src/Graph.cpp b/Code/Mantid/MantidPlot/src/Graph.cpp
@@ -591,11 +591,16 @@ void Graph::showAxis(int axis, int type, const QString& formatInfo, Table *table
   if (!axisOn)
     return;
 
-  QList<int> majTicksTypeList = d_plot->getMajorTicksType();
-  QList<int> minTicksTypeList = d_plot->getMinorTicksType();
-
   QwtScaleWidget *scale = dynamic_cast<QwtScaleWidget *>(d_plot->axisWidget(axis));
+  if (!scale)
+    return;
+
   ScaleDraw *sd = dynamic_cast<ScaleDraw *>(d_plot->axisScaleDraw(axis));
+  if (!sd)
+    return;
+
+  QList<int> majTicksTypeList = d_plot->getMajorTicksType();
+  QList<int> minTicksTypeList = d_plot->getMinorTicksType();
 
   if (d_plot->axisEnabled (axis) == axisOn &&
       majTicksTypeList[axis] == majTicksType &&