Fix memory leak in filter multipoint

nyalldawson · nyalldawson · commit e84f37b036d6 · 2018-08-14T10:12:19.000+10:00
(cherry-picked from 73f3164)
diff --git a/src/core/geometry/qgsmultipoint.cpp b/src/core/geometry/qgsmultipoint.cpp
@@ -189,10 +189,21 @@ void QgsMultiPoint::filterVertices( const std::function<bool ( const QgsPoint &
   {
     if ( const QgsPoint *point = qgsgeometry_cast< const QgsPoint * >( part ) )
     {
-      return !filter( *point );
+      if ( !filter( *point ) )
+      {
+        delete point;
+        return true;
+      }
+      else
+      {
+        return false;
+      }
     }
     else
+    {
+      delete part;
       return true;
+    }
   } ), mGeometries.end() ); // clazy:exclude=detaching-member
 }
 

Original file line number	Diff line number	Diff line change
`@@ -189,10 +189,21 @@ void QgsMultiPoint::filterVertices( const std::function<bool ( const QgsPoint &`
`189`	`189`	`{`
`190`	`190`	`if ( const QgsPoint point = qgsgeometry_cast< const QgsPoint >( part ) )`
`191`	`191`	`{`
`192`		`- return !filter( *point );`
	`192`	`+ if ( !filter( *point ) )`
	`193`	`+ {`
	`194`	`+ delete point;`
	`195`	`+ return true;`
	`196`	`+ }`
	`197`	`+ else`
	`198`	`+ {`
	`199`	`+ return false;`
	`200`	`+ }`
`193`	`201`	`}`
`194`	`202`	`else`
	`203`	`+ {`
	`204`	`+ delete part;`
`195`	`205`	`return true;`
	`206`	`+ }`
`196`	`207`	`} ), mGeometries.end() ); // clazy:exclude=detaching-member`
`197`	`208`	`}`
`198`	`209`