Fix memory leak when inserting invalid geometries

qgis · Sep 25, 2017 · b46d8d3 · b46d8d3
1 parent 307efe3
commit b46d8d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
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 );
 }