Call function throwGeosException to avoid segfault with invalid ring geometries. Fixes bug #1667

mhugent · mhugent · commit 6257e1fac259 · 2009-04-30T21:26:23.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10689 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -2659,11 +2659,15 @@ int QgsGeometry::addRing( const QList<QgsPoint>& ring )
   {
     newRing = createGeosLinearRing( ring.toVector() );
     if ( !GEOSisValid( newRing ) )
-      throw GEOSException( "ring is invalid" );
+    {
+        throwGEOSException("ring is invalid");
+    }
 
     newRingPolygon = createGeosPolygon( newRing );
     if ( !GEOSisValid( newRingPolygon ) )
-      throw GEOSException( "ring polygon is invalid" );
+    {
+        throwGEOSException("ring is invalid");
+    }
   }
   catch ( GEOSException &e )
   {

Original file line number	Diff line number	Diff line change
`@@ -2659,11 +2659,15 @@ int QgsGeometry::addRing( const QList<QgsPoint>& ring )`
`2659`	`2659`	`{`
`2660`	`2660`	`newRing = createGeosLinearRing( ring.toVector() );`
`2661`	`2661`	`if ( !GEOSisValid( newRing ) )`
`2662`		`- throw GEOSException( "ring is invalid" );`
	`2662`	`+ {`
	`2663`	`+ throwGEOSException("ring is invalid");`
	`2664`	`+ }`
`2663`	`2665`
`2664`	`2666`	`newRingPolygon = createGeosPolygon( newRing );`
`2665`	`2667`	`if ( !GEOSisValid( newRingPolygon ) )`
`2666`		`- throw GEOSException( "ring polygon is invalid" );`
	`2668`	`+ {`
	`2669`	`+ throwGEOSException("ring is invalid");`
	`2670`	`+ }`
`2667`	`2671`	`}`
`2668`	`2672`	`catch ( GEOSException &e )`
`2669`	`2673`	`{`