Fix crash with malformed WKT

nyalldawson · nyalldawson · commit 18744b4123b1 · 2015-11-10T17:08:48.000+11:00
diff --git a/src/core/geometry/qgscurvepolygonv2.cpp b/src/core/geometry/qgscurvepolygonv2.cpp
@@ -173,6 +173,12 @@ bool QgsCurvePolygonV2::fromWkt( const QString& wkt )
     }
   }
 
+  if ( mInteriorRings.isEmpty() )
+  {
+    clear();
+    return false;
+  }
+
   mExteriorRing = mInteriorRings.first();
   mInteriorRings.removeFirst();
 
diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py
@@ -129,7 +129,11 @@ def testReferenceGeometry(self):
 
                 #test that geometry can be created from WKT
                 geom = QgsGeometry.fromWkt(row['wkt'])
-                assert geom, "WKT conversion {} failed: could not create geom:\n{}\n".format(i + 1, row['wkt'])
+                if row['valid_wkt']:
+                    assert geom, "WKT conversion {} failed: could not create geom:\n{}\n".format(i + 1, row['wkt'])
+                else:
+                    assert not geom, "Corrupt WKT {} was incorrectly converted to geometry:\n{}\n".format(i + 1, row['wkt'])
+                    continue
 
                 #test exporting to WKT results in expected string
                 result = geom.exportToWkt()
diff --git a/tests/testdata/geom_data.csv b/tests/testdata/geom_data.csv
@@ -97,6 +97,8 @@ Point( 1 2 3 4 ),PointZM( 1 2 3 4 ),1,0,0,0,1,0,0,Point( 1 2 ),1,2,1,2,"4d coord
 PointM( 4 5 6 ),PointM ( 4 5 6 ),1,0,0,0,1,0,0,POINT(4 5),4,5,4,5,
 PointZ (1 2 3),POINT Z (1 2 3),1,0,0,0,1,0,0,POINT(1 2),1,2,1,2,
 PointZM( 7 8 9 10 ),PointZM( 7 8 9 10 ),1,0,0,0,1,0,0,POINT( 7 8 ),7,8,7,8,
+Polygon(),,,,,,,,,,,,,,Malformed WKT
+Polygon,,,,,,,,,,,,,,Malformed WKT
 "Polygon ((0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7, 5 5),(1 1,2 1, 2 2, 1 2, 1 1))","POLYGON((0 0,10 0,10 10,0 10,0 0),(5 5,7 5,7 7,5 7,5 5),(1 1,2 1,2 2,1 2,1 1))",15,0,95,52,1,2,0,POINT(4.99473684210526 4.99473684210526),0,0,10,10,
 "Polygon ((0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7, 5 5))","POLYGON((0 0,10 0,10 10,0 10,0 0),(5 5,7 5,7 7,5 7,5 5))",10,0,96,48,1,1,0,POINT(4.95833333333333 4.95833333333333),0,0,10,10,
 "Polygon ((0 0, 10 0, 10 10, 0 10, 0 0))","POLYGON((0 0,10 0,10 10,0 10,0 0))",5,0,100,40,1,0,0,POINT(5 5),0,0,10,10,

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,12 @@ bool QgsCurvePolygonV2::fromWkt( const QString& wkt )`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
	`176`	`+ if ( mInteriorRings.isEmpty() )`
	`177`	`+ {`
	`178`	`+ clear();`
	`179`	`+ return false;`
	`180`	`+ }`
	`181`	`+`
`176`	`182`	`mExteriorRing = mInteriorRings.first();`
`177`	`183`	`mInteriorRings.removeFirst();`
`178`	`184`