Fix geometry length and area calculation (fix #12827)

nyalldawson · nyalldawson · commit e295c1fbb7b6 · 2015-06-02T07:37:11.000+10:00
diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp
@@ -270,7 +270,8 @@ double QgsGeos::area() const
 
   try
   {
-    area = GEOSArea_r( geosinit.ctxt, mGeos, &area );
+    if ( GEOSArea_r( geosinit.ctxt, mGeos, &area ) != 1 )
+      return -1.0;
   }
   CATCH_GEOS( -1.0 );
   return area;
@@ -285,7 +286,8 @@ double QgsGeos::length() const
   }
   try
   {
-    length = GEOSLength_r( geosinit.ctxt, mGeos, &length );
+    if ( GEOSLength_r( geosinit.ctxt, mGeos, &length ) != 1 )
+      return -1.0;
   }
   CATCH_GEOS( -1.0 )
   return length;

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,8 @@ double QgsGeos::area() const`
`270`	`270`
`271`	`271`	`try`
`272`	`272`	`{`
`273`		`- area = GEOSArea_r( geosinit.ctxt, mGeos, &area );`
	`273`	`+ if ( GEOSArea_r( geosinit.ctxt, mGeos, &area ) != 1 )`
	`274`	`+ return -1.0;`
`274`	`275`	`}`
`275`	`276`	`CATCH_GEOS( -1.0 );`
`276`	`277`	`return area;`
`@@ -285,7 +286,8 @@ double QgsGeos::length() const`
`285`	`286`	`}`
`286`	`287`	`try`
`287`	`288`	`{`
`288`		`- length = GEOSLength_r( geosinit.ctxt, mGeos, &length );`
	`289`	`+ if ( GEOSLength_r( geosinit.ctxt, mGeos, &length ) != 1 )`
	`290`	`+ return -1.0;`
`289`	`291`	`}`
`290`	`292`	`CATCH_GEOS( -1.0 )`
`291`	`293`	`return length;`