Avoid nullptr dereference

root-project · Apr 17, 2017 · 5ff21c9 · 5ff21c9 · smuzaffar · May 15, 2017
1 parent 6eb83c4
commit 5ff21c9
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/hist/hist/src/TF1.cxx b/hist/hist/src/TF1.cxx
@@ -628,10 +628,12 @@ void TF1::DoInitialize(EAddToList addToGlobalList)
       R__LOCKGUARD2(gROOTMutex);
       // Store formula in linked list of formula in ROOT
       TF1 *f1old = (TF1 *)gROOT->GetListOfFunctions()->FindObject(fName);
-      gROOT->GetListOfFunctions()->Remove(f1old);
-      // We removed f1old from the list, it is not longer global.
-      // (See TF1::AddToGlobalList which requires this flag to be correct).
-      f1old->SetBit(kNotGlobal, kTRUE);
+      if (f1old) {
+         gROOT->GetListOfFunctions()->Remove(f1old);
+         // We removed f1old from the list, it is not longer global.
+         // (See TF1::AddToGlobalList which requires this flag to be correct).
+         f1old->SetBit(kNotGlobal, kTRUE);
+      }
       gROOT->GetListOfFunctions()->Add(this);
    } else
       SetBit(kNotGlobal, kTRUE);