Catch when GEOSCoordSeq_create_r returns 0 (should fix crash in #13934)

jef-n · jef-n · commit cd830c460ab0 · 2015-12-03T21:18:19.000+01:00
diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp
@@ -1487,6 +1487,11 @@ GEOSCoordSequence* QgsGeos::createCoordinateSequence( const QgsCurveV2* curve, d
   try
   {
     coordSeq = GEOSCoordSeq_create_r( geosinit.ctxt, numPoints, coordDims );
+    if ( !coordSeq )
+    {
+      QgsMessageLog::logMessage( QObject::tr( "Could not create coordinate sequence for %1 points in %2 dimensions" ).arg( numPoints ).arg( coordDims ), QObject::tr( "GEOS" ) );
+      return 0;
+    }
     if ( precision > 0. )
     {
       for ( int i = 0; i < numPoints; ++i )
@@ -1542,6 +1547,11 @@ GEOSGeometry* QgsGeos::createGeosPoint( const QgsAbstractGeometryV2* point, int
   try
   {
     GEOSCoordSequence* coordSeq = GEOSCoordSeq_create_r( geosinit.ctxt, 1, coordDims );
+    if ( !coordSeq )
+    {
+      QgsMessageLog::logMessage( QObject::tr( "Could not create coordinate sequence for point with %1 dimensions" ).arg( coordDims ), QObject::tr( "GEOS" ) );
+      return 0;
+    }
     if ( precision > 0. )
     {
       GEOSCoordSeq_setX_r( geosinit.ctxt, coordSeq, 0, qgsRound( pt->x() / precision ) * precision );

Original file line number	Diff line number	Diff line change
`@@ -1487,6 +1487,11 @@ GEOSCoordSequence* QgsGeos::createCoordinateSequence( const QgsCurveV2* curve, d`
`1487`	`1487`	`try`
`1488`	`1488`	`{`
`1489`	`1489`	`coordSeq = GEOSCoordSeq_create_r( geosinit.ctxt, numPoints, coordDims );`
	`1490`	`+ if ( !coordSeq )`
	`1491`	`+ {`
	`1492`	`+ QgsMessageLog::logMessage( QObject::tr( "Could not create coordinate sequence for %1 points in %2 dimensions" ).arg( numPoints ).arg( coordDims ), QObject::tr( "GEOS" ) );`
	`1493`	`+ return 0;`
	`1494`	`+ }`
`1490`	`1495`	`if ( precision > 0. )`
`1491`	`1496`	`{`
`1492`	`1497`	`for ( int i = 0; i < numPoints; ++i )`
`@@ -1542,6 +1547,11 @@ GEOSGeometry* QgsGeos::createGeosPoint( const QgsAbstractGeometryV2* point, int`
`1542`	`1547`	`try`
`1543`	`1548`	`{`
`1544`	`1549`	`GEOSCoordSequence* coordSeq = GEOSCoordSeq_create_r( geosinit.ctxt, 1, coordDims );`
	`1550`	`+ if ( !coordSeq )`
	`1551`	`+ {`
	`1552`	`+ QgsMessageLog::logMessage( QObject::tr( "Could not create coordinate sequence for point with %1 dimensions" ).arg( coordDims ), QObject::tr( "GEOS" ) );`
	`1553`	`+ return 0;`
	`1554`	`+ }`
`1545`	`1555`	`if ( precision > 0. )`
`1546`	`1556`	`{`
`1547`	`1557`	`GEOSCoordSeq_setX_r( geosinit.ctxt, coordSeq, 0, qgsRound( pt->x() / precision ) * precision );`