Guard from crashes for all uses of measureLine/measurePolygon

Author: nirvn

src/core/distancearea.cpp

@@ -138,10 +138,20 @@ void DistanceArea::setGeometry( Geometry *geometry )
 
 qreal DistanceArea::length() const
 {
+  double length = std::numeric_limits<double>::quiet_NaN();
   if ( mRubberbandModel )
-    return mDistanceArea.measureLine( mRubberbandModel->flatPointSequence( mCrs ) );
+  {
+    try
+    {
+      length = mDistanceArea.measureLine( mRubberbandModel->flatPointSequence( mCrs ) );
+    }
+    catch ( const QgsException & )
+    {
+      length = std::numeric_limits<double>::quiet_NaN();
+    }
+  }
 
-  return qQNaN();
+  return length;
 }
 
 bool DistanceArea::lengthValid() const
@@ -197,10 +207,20 @@ bool DistanceArea::perimeterValid() const
 
 qreal DistanceArea::area() const
 {
+  double area = std::numeric_limits<double>::quiet_NaN();
   if ( mRubberbandModel )
-    return mDistanceArea.measurePolygon( mRubberbandModel->flatPointSequence( mCrs ) );
+  {
+    try
+    {
+      area = mDistanceArea.measurePolygon( mRubberbandModel->flatPointSequence( mCrs ) );
+    }
+    catch ( const QgsException & )
+    {
+      area = std::numeric_limits<double>::quiet_NaN();
+    }
+  }
 
-  return qQNaN();
+  return area;
 }
 
 bool DistanceArea::areaValid() const
@@ -242,7 +262,16 @@ qreal DistanceArea::segmentLength() const
   pointIt--;
   flatPoints << *pointIt;
 
-  return mDistanceArea.measureLine( flatPoints );
+  double length = std::numeric_limits<double>::quiet_NaN();
+  try
+  {
+    length = mDistanceArea.measureLine( flatPoints );
+  }
+  catch ( const QgsException & )
+  {
+    length = std::numeric_limits<double>::quiet_NaN();
+  }
+  return length;
 }
 
 qreal DistanceArea::azimuth() const

src/core/navigation.cpp

@@ -273,7 +273,16 @@ void Navigation::updateDetails()
   const QgsPoint destinationPoint = destination();
   const bool handleZ = QgsWkbTypes::hasZ( mLocation.wkbType() )
                        && QgsWkbTypes::hasZ( destinationPoint.wkbType() );
-  mDistance = mDa.measureLine( mLocation, destinationPoint );
+
+  try
+  {
+    mDistance = mDa.measureLine( mLocation, destinationPoint );
+  }
+  catch ( const QgsException & )
+  {
+    mDistance = 0.0;
+  }
+
   if ( handleZ )
   {
     mVerticalDistance = destinationPoint.z() - mLocation.z();

src/core/tracker.cpp

@@ -205,7 +205,14 @@ void Tracker::positionReceived()
     QgsDistanceArea distanceArea;
     distanceArea.setEllipsoid( QgsProject::instance()->ellipsoid() );
     distanceArea.setSourceCrs( QgsProject::instance()->crs(), QgsProject::instance()->transformContext() );
-    mCurrentDistance = distanceArea.measureLine( flatPoints );
+    try
+    {
+      mCurrentDistance = distanceArea.measureLine( flatPoints );
+    }
+    catch ( const QgsException & )
+    {
+      mCurrentDistance = 0.0;
+    }
   }
 
   if ( !qgsDoubleNear( mMinimumDistance, 0.0 ) )