split geometry: cleanup parts if split failed (followup 6272274)

jef-n · jef-n · commit 2df4bdcc885d · 2013-07-12T22:49:37.000+02:00
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -5470,15 +5470,20 @@ int QgsGeometry::splitPolygonGeometry( GEOSGeometry* splitLine, QList<QgsGeometr
     mDirtyWkb = true;
   }
 
-  for ( int i = 1; i < testedGeometries.size(); ++i )
+  int i;
+  for ( i = 1; i < testedGeometries.size() && GEOSisValid( testedGeometries[i] ); ++i )
+    ;
+
+  if ( i < testedGeometries.size() )
   {
-    if ( GEOSisValid( testedGeometries[i] ) != 1 )
+    for ( i = 0; i < testedGeometries.size(); ++i )
     {
-      return 3;
+      GEOSGeom_destroy( testedGeometries[i] );
     }
+    return 3;
   }
 
-  for ( int i = 1; i < testedGeometries.size(); ++i )
+  for ( i = 1; i < testedGeometries.size(); ++i )
   {
     newGeometries << fromGeosGeom( testedGeometries[i] );
   }

Original file line number	Diff line number	Diff line change
`@@ -5470,15 +5470,20 @@ int QgsGeometry::splitPolygonGeometry( GEOSGeometry* splitLine, QList<QgsGeometr`
`5470`	`5470`	`mDirtyWkb = true;`
`5471`	`5471`	`}`
`5472`	`5472`
`5473`		`- for ( int i = 1; i < testedGeometries.size(); ++i )`
	`5473`	`+ int i;`
	`5474`	`+ for ( i = 1; i < testedGeometries.size() && GEOSisValid( testedGeometries[i] ); ++i )`
	`5475`	`+ ;`
	`5476`	`+`
	`5477`	`+ if ( i < testedGeometries.size() )`
`5474`	`5478`	`{`
`5475`		`- if ( GEOSisValid( testedGeometries[i] ) != 1 )`
	`5479`	`+ for ( i = 0; i < testedGeometries.size(); ++i )`
`5476`	`5480`	`{`
`5477`		`- return 3;`
	`5481`	`+ GEOSGeom_destroy( testedGeometries[i] );`
`5478`	`5482`	`}`
	`5483`	`+ return 3;`
`5479`	`5484`	`}`
`5480`	`5485`
`5481`		`- for ( int i = 1; i < testedGeometries.size(); ++i )`
	`5486`	`+ for ( i = 1; i < testedGeometries.size(); ++i )`
`5482`	`5487`	`{`
`5483`	`5488`	`newGeometries << fromGeosGeom( testedGeometries[i] );`
`5484`	`5489`	`}`