Fix some possible null pointer dereferences

qgis · May 30, 2015 · cf7303f · cf7303f
1 parent e5fb5a6
commit cf7303f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/gui/symbology-ng/qgsrendererv2widget.cpp b/src/gui/symbology-ng/qgsrendererv2widget.cpp
@@ -137,7 +137,8 @@ void QgsRendererV2Widget::changeSymbolWidth()
       QList<QgsSymbolV2*>::iterator symbolIt = symbolList.begin();
       for ( ; symbolIt != symbolList.end(); ++symbolIt )
       {
-        dynamic_cast<QgsLineSymbolV2*>( *symbolIt )->setWidth( dlg.mSpinBox->value() );
+        if (( *symbolIt )->type() == QgsSymbolV2::Line )
+          static_cast<QgsLineSymbolV2*>( *symbolIt )->setWidth( dlg.mSpinBox->value() );
       }
     }
     refreshSymbolView();
@@ -161,7 +162,8 @@ void QgsRendererV2Widget::changeSymbolSize()
       QList<QgsSymbolV2*>::iterator symbolIt = symbolList.begin();
       for ( ; symbolIt != symbolList.end(); ++symbolIt )
       {
-        dynamic_cast<QgsMarkerSymbolV2*>( *symbolIt )->setSize( dlg.mSpinBox->value() );
+        if (( *symbolIt )->type() == QgsSymbolV2::Marker )
+          static_cast<QgsMarkerSymbolV2*>( *symbolIt )->setSize( dlg.mSpinBox->value() );
       }
     }
     refreshSymbolView();
@@ -185,7 +187,8 @@ void QgsRendererV2Widget::changeSymbolAngle()
       QList<QgsSymbolV2*>::iterator symbolIt = symbolList.begin();
       for ( ; symbolIt != symbolList.end(); ++symbolIt )
       {
-        dynamic_cast<QgsMarkerSymbolV2*>( *symbolIt )->setAngle( dlg.mSpinBox->value() );
+        if (( *symbolIt )->type() == QgsSymbolV2::Marker )
+          static_cast<QgsMarkerSymbolV2*>( *symbolIt )->setAngle( dlg.mSpinBox->value() );
       }
     }
     refreshSymbolView();