Skip to content

Commit 2668ed5

Browse files
workaround: Leak GeoSets in GeoInterface
Instead of leaking the complete FairGeoLoader, only leak the FairGeoSets in FairGeoInterface. Still does not fix #1514 See: #1514
1 parent 1156296 commit 2668ed5

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

fairroot/base/steer/FairRunSim.cxx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ FairRunSim::~FairRunSim()
111111
// Do not point to a destructed object!
112112
fginstance = nullptr;
113113
}
114-
115-
/// \bug Leaks GeoLoader and related resources, prevents memory issues (probably a double free)
116-
/// See: https://github.com/FairRootGroup/FairRoot/issues/1514
117-
static_cast<void>(fGeoLoader.release());
118114
}
119115

120116
FairRunSim* FairRunSim::Instance()

fairroot/geobase/FairGeoInterface.cxx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/********************************************************************************
2-
* Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
2+
* Copyright (C) 2014-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
33
* *
44
* This software is distributed under the terms of the *
55
* GNU Lesser General Public Licence (LGPL) version 3, *
@@ -79,7 +79,9 @@ FairGeoInterface::~FairGeoInterface()
7979
masterNodes = 0;
8080
}
8181
if (sets) {
82-
sets->Delete();
82+
/// \bug Leaks "FairGeoSet"s and related resources, prevents memory issues (pr>
83+
/// See: https://github.com/FairRootGroup/FairRoot/issues/1514
84+
// sets->Delete();
8385
delete sets;
8486
sets = 0;
8587
}

0 commit comments

Comments
 (0)