Fix memory leak when inserting invalid geometries

nyalldawson · nyalldawson · commit b46d8d3d33e8 · 2017-09-26T08:41:26.000+10:00
diff --git a/src/core/geometry/qgsmultilinestring.cpp b/src/core/geometry/qgsmultilinestring.cpp
@@ -128,7 +128,10 @@ bool QgsMultiLineString::addGeometry( QgsAbstractGeometry *g )
 bool QgsMultiLineString::insertGeometry( QgsAbstractGeometry *g, int index )
 {
   if ( !g || QgsWkbTypes::flatType( g->wkbType() ) != QgsWkbTypes::LineString )
+  {
+    delete g;
     return false;
+  }
 
   return QgsGeometryCollection::insertGeometry( g, index );
 }
diff --git a/src/core/geometry/qgsmultipoint.cpp b/src/core/geometry/qgsmultipoint.cpp
@@ -142,7 +142,10 @@ bool QgsMultiPointV2::addGeometry( QgsAbstractGeometry *g )
 bool QgsMultiPointV2::insertGeometry( QgsAbstractGeometry *g, int index )
 {
   if ( !g || QgsWkbTypes::flatType( g->wkbType() ) != QgsWkbTypes::Point )
+  {
+    delete g;
     return false;
+  }
 
   return QgsGeometryCollection::insertGeometry( g, index );
 }

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,10 @@ bool QgsMultiLineString::addGeometry( QgsAbstractGeometry *g )`
`128`	`128`	`bool QgsMultiLineString::insertGeometry( QgsAbstractGeometry *g, int index )`
`129`	`129`	`{`
`130`	`130`	`if ( !g \|\| QgsWkbTypes::flatType( g->wkbType() ) != QgsWkbTypes::LineString )`
	`131`	`+ {`
	`132`	`+ delete g;`
`131`	`133`	`return false;`
	`134`	`+ }`
`132`	`135`
`133`	`136`	`return QgsGeometryCollection::insertGeometry( g, index );`
`134`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,10 @@ bool QgsMultiPointV2::addGeometry( QgsAbstractGeometry *g )`
`142`	`142`	`bool QgsMultiPointV2::insertGeometry( QgsAbstractGeometry *g, int index )`
`143`	`143`	`{`
`144`	`144`	`if ( !g \|\| QgsWkbTypes::flatType( g->wkbType() ) != QgsWkbTypes::Point )`
	`145`	`+ {`
	`146`	`+ delete g;`
`145`	`147`	`return false;`
	`148`	`+ }`
`146`	`149`
`147`	`150`	`return QgsGeometryCollection::insertGeometry( g, index );`
`148`	`151`	`}`