Skip to content

Fix memleak in ConfKeyValues #15488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
f3sch wants to merge 1 commit into
base: dev
Choose a base branch
from
+13 −10
Open

Fix memleak in ConfKeyValues #15488

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions Common/Utils/include/CommonUtils/ConfigurableParamHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include "CommonUtils/ConfigurableParam.h"
#include "TClass.h"
#include <memory>
#include <type_traits>
#include <typeinfo>
#include "TFile.h"
Expand Down Expand Up @@ -105,22 +106,23 @@ class ConfigurableParamHelper : virtual public ConfigurableParam
if (!isInitialized()) {
initialize();
}
auto members = getDataMembers();
_ParamHelper::printMembersImpl(getName(), members, showProv, useLogger, withPadding, showHash);
auto members = std::unique_ptr<std::vector<ParamDataMember>>(getDataMembers());
_ParamHelper::printMembersImpl(getName(), members.get(), showProv, useLogger, withPadding, showHash);
}

//
size_t getHash() const final
{
return _ParamHelper::getHashImpl(getName(), getDataMembers());
auto members = std::unique_ptr<std::vector<ParamDataMember>>(getDataMembers());
return _ParamHelper::getHashImpl(getName(), members.get());
}

// ----------------------------------------------------------------

void output(std::ostream& out) const final
{
auto members = getDataMembers();
_ParamHelper::outputMembersImpl(out, getName(), members, true, false);
auto members = std::unique_ptr<std::vector<ParamDataMember>>(getDataMembers());
_ParamHelper::outputMembersImpl(out, getName(), members.get(), true, false);
}

// ----------------------------------------------------------------
Expand Down Expand Up @@ -242,22 +244,23 @@ class ConfigurableParamPromoter : public Base, virtual public ConfigurableParam
if (!isInitialized()) {
initialize();
}
auto members = getDataMembers();
_ParamHelper::printMembersImpl(getName(), members, showProv, useLogger, withPadding, showHash);
auto members = std::unique_ptr<std::vector<ParamDataMember>>(getDataMembers());
_ParamHelper::printMembersImpl(getName(), members.get(), showProv, useLogger, withPadding, showHash);
}

//
size_t getHash() const final
{
return _ParamHelper::getHashImpl(getName(), getDataMembers());
auto members = std::unique_ptr<std::vector<ParamDataMember>>(getDataMembers());
return _ParamHelper::getHashImpl(getName(), members.get());
}

// ----------------------------------------------------------------

void output(std::ostream& out) const final
{
auto members = getDataMembers();
_ParamHelper::outputMembersImpl(out, getName(), members, true, false);
auto members = std::unique_ptr<std::vector<ParamDataMember>>(getDataMembers());
_ParamHelper::outputMembersImpl(out, getName(), members.get(), true, false);
}

// ----------------------------------------------------------------
Expand Down