zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: avoid memory leak caused by IOobjectList::filterObjects (#1286)

Browse Source
This commit is contained in:
Mark Olesen
2019-05-01 17:22:52 +02:00
parent 29f40170de
commit 6f17d46b71
1 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/OpenFOAM/db/IOobjectList/IOobjectListTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -622,11 +622,16 @@ Foam::label Foam::IOobjectList::filterClasses
const bool pruning
)
{
// return HashPtrTable<IOobject>::filterValues
// (
// [&](const IOobject* io){ return pred(io->headerClassName()); },
// pruning
// );
// This is like
// return HashPtrTable<IOobject>::filterValues
// (
// [&](const IOobject* io){ return pred(io->headerClassName()); },
// pruning
// );
// which is really
// return HashTable<IOobject*>::filterValues
//
// except that it does not leak
label changed = 0;
@ -654,7 +659,29 @@ Foam::label Foam::IOobjectList::filterObjects
const bool pruning
)
{
return HashPtrTable<IOobject>::filterKeys(pred, pruning);
// This is like
// return HashPtrTable<IOobject>::filterKeys(pred, pruning);
// which is really
// return HashTable<IOobject*>::filterKeys(pred, pruning);
//
// except that it does not leak
label changed = 0;
for (iterator iter = begin(); iter != end(); ++iter)
{
// Matches? either prune (pruning) or keep (!pruning)
if
(
(pred(iter.key()) ? pruning : !pruning)
&& erase(iter)
)
{
++changed;
}
}
return changed;
}