Catch a possible exception in QgsGeometry::makeValid

nyalldawson · nyalldawson · commit a24e2bd3de7a · 2018-03-06T12:20:24.000+11:00
(cherry-picked from b61882f)
diff --git a/src/core/geometry/qgsgeometrymakevalid.cpp b/src/core/geometry/qgsgeometrymakevalid.cpp
@@ -457,13 +457,15 @@ static GEOSGeometry *LWGEOM_GEOS_nodeLines( const GEOSGeometry *lines )
   if ( ! point )
     return nullptr;
 
-  GEOSGeometry *noded = GEOSUnion_r( handle, lines, point );
-  if ( !noded )
+  GEOSGeometry *noded = nullptr;
+  try
   {
-    GEOSGeom_destroy_r( handle, point );
-    return nullptr;
+    noded = GEOSUnion_r( handle, lines, point );
+  }
+  catch ( GEOSException & )
+  {
+    // no need to do anything here - we'll return nullptr anyway
   }
-
   GEOSGeom_destroy_r( handle, point );
   return noded;
 }
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -2934,6 +2934,7 @@ QgsGeometry QgsPalLabeling::prepareGeometry( const QgsGeometry &geometry, QgsRen
     QgsGeometry validGeom = geom.makeValid();
     if ( validGeom.isNull() )
     {
+      QgsDebugMsg( QString( "Could not repair geometry: %1" ).arg( validGeom.lastError() ) );
       return QgsGeometry();
     }
     geom = validGeom;

Original file line number	Diff line number	Diff line change
`@@ -2934,6 +2934,7 @@ QgsGeometry QgsPalLabeling::prepareGeometry( const QgsGeometry &geometry, QgsRen`
`2934`	`2934`	`QgsGeometry validGeom = geom.makeValid();`
`2935`	`2935`	`if ( validGeom.isNull() )`
`2936`	`2936`	`{`
	`2937`	`+ QgsDebugMsg( QString( "Could not repair geometry: %1" ).arg( validGeom.lastError() ) );`
`2937`	`2938`	`return QgsGeometry();`
`2938`	`2939`	`}`
`2939`	`2940`	`geom = validGeom;`