Catch some uncaught transform exceptions

qgis · May 29, 2018 · c013c23 · c013c23
1 parent ff7c70f
commit c013c23
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/src/app/vertextool/qgsvertexeditor.cpp b/src/app/vertextool/qgsvertexeditor.cpp
@@ -373,7 +373,15 @@ void QgsVertexEditor::zoomToVertex( int idx )
   QgsPointXY newCenter( x, y );
 
   QgsCoordinateTransform t( mLayer->crs(), mCanvas->mapSettings().destinationCrs(), QgsProject::instance() );
-  QgsPointXY tCenter = t.transform( newCenter );
+  QgsPointXY tCenter;
+  try
+  {
+    tCenter = t.transform( newCenter );
+  }
+  catch ( QgsCsException & )
+  {
+    return;
+  }
 
   QPolygonF ext = mCanvas->mapSettings().visiblePolygon();
   //close polygon

diff --git a/src/core/qgsvectorlayerlabelprovider.cpp b/src/core/qgsvectorlayerlabelprovider.cpp
@@ -285,7 +285,14 @@ QgsGeometry QgsVectorLayerLabelProvider::getPointObstacleGeometry( QgsFeature &f
     //transform point to pixels
     if ( context.coordinateTransform().isValid() )
     {
-      context.coordinateTransform().transformInPlace( x, y, z );
+      try
+      {
+        context.coordinateTransform().transformInPlace( x, y, z );
+      }
+      catch ( QgsCsException & )
+      {
+        return QgsGeometry();
+      }
     }
     context.mapToPixel().transformInPlace( x, y );
 
@@ -318,7 +325,14 @@ QgsGeometry QgsVectorLayerLabelProvider::getPointObstacleGeometry( QgsFeature &f
     }
     if ( context.coordinateTransform().isValid() )
     {
-      boundLineString->transform( context.coordinateTransform(), QgsCoordinateTransform::ReverseTransform );
+      try
+      {
+        boundLineString->transform( context.coordinateTransform(), QgsCoordinateTransform::ReverseTransform );
+      }
+      catch ( QgsCsException & )
+      {
+        return QgsGeometry();
+      }
     }
     boundLineString->close();
 

diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
@@ -237,7 +237,14 @@ void QgsRubberBand::addGeometry( const QgsGeometry &geometry, QgsVectorLayer *la
   if ( layer )
   {
     QgsCoordinateTransform ct = mMapCanvas->mapSettings().layerTransform( layer );
-    geom.transform( ct );
+    try
+    {
+      geom.transform( ct );
+    }
+    catch ( QgsCsException & )
+    {
+      return;
+    }
   }
 
   addGeometry( geom );