Skip to content

Protect access to TROOT::GetListOfGlobalFunctions in TFormula #117

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

Merged
FonsRademakers merged 1 commit into from
Dec 14, 2015
Merged

Protect access to TROOT::GetListOfGlobalFunctions in TFormula #117

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
18 changes: 15 additions & 3 deletions hist/hist/src/TFormula.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,11 @@ void TFormula::ExtractFunctors(TString &formula)
//std::cout << "check if character : " << i << " " << formula[i] << " from name " << name << " is a function " << std::endl;

// check if function is provided by gROOT
TObject *obj = gROOT->GetListOfFunctions()->FindObject(name);
TObject *obj = 0;
{
R__LOCKGUARD2(gROOTMutex);
obj = gROOT->GetListOfFunctions()->FindObject(name);
}
TFormula * f = dynamic_cast<TFormula*> (obj);
if (!f) {
// maybe object is a TF1
Expand Down Expand Up @@ -1602,7 +1606,11 @@ void TFormula::ProcessFormula(TString &formula)
if(!fun.fFound)
{
// try to look into all the global functions in gROOT
TFunction * f = (TFunction*) gROOT->GetListOfGlobalFunctions(true)->FindObject(fun.fName);
TFunction* f;
{
R__LOCKGUARD2(gROOTMutex);
f = (TFunction*) gROOT->GetListOfGlobalFunctions(true)->FindObject(fun.fName);
}
// if found a function with matching arguments
if (f && fun.GetNargs() <= f->GetNargs() && fun.GetNargs() >= f->GetNargs() - f->GetNargsOpt() )
{
Expand All @@ -1620,7 +1628,11 @@ void TFormula::ProcessFormula(TString &formula)
}
else
{
TFormula *old = (TFormula*)gROOT->GetListOfFunctions()->FindObject(gNamePrefix + fun.fName);
TFormula* old = 0;
{
R__LOCKGUARD2(gROOTMutex);
old = (TFormula*)gROOT->GetListOfFunctions()->FindObject(gNamePrefix + fun.fName);
}
if(old)
{
// we should not go here (this analysis is done before in ExtractFunctors)
Expand Down