Avoid access gROOT after its teardown in destructors (Fix ROOT-8395)

saberduck · Oct 13, 2016 · fe42bc0 · fe42bc0
1 parent f7c399e
commit fe42bc0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/graf2d/graf/src/TCutG.cxx b/graf2d/graf/src/TCutG.cxx
@@ -242,7 +242,8 @@ TCutG::~TCutG()
 {
    delete fObjectX;
    delete fObjectY;
-   gROOT->GetListOfSpecials()->Remove(this);
+   if ( gROOT && !gROOT->TestBit( TObject::kInvalidObject ) )
+      gROOT->GetListOfSpecials()->Remove(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/math/fumili/src/TFumili.cxx b/math/fumili/src/TFumili.cxx
@@ -211,7 +211,8 @@ void TFumili::BuildArrays(){
 
 TFumili::~TFumili() {
    DeleteArrays();
-   gROOT->GetListOfSpecials()->Remove(this);
+   if (gROOT && !gROOT->TestBit(TObject::kInvalidObject))
+      gROOT->GetListOfSpecials()->Remove(this);
    if (gFumili == this) gFumili = 0;
 }
 

diff --git a/montecarlo/eg/src/TDatabasePDG.cxx b/montecarlo/eg/src/TDatabasePDG.cxx
@@ -91,7 +91,8 @@ TDatabasePDG::~TDatabasePDG()
       fListOfClasses->Delete();
       delete fListOfClasses;
    }
-   gROOT->GetListOfSpecials()->Remove(this);
+   if (gROOT && !gROOT->TestBit(TObject::kInvalidObject))
+      gROOT->GetListOfSpecials()->Remove(this);
    auto fgInstance = GetInstancePtr();
    *fgInstance = nullptr;
 }

diff --git a/tree/tree/src/TChain.cxx b/tree/tree/src/TChain.cxx
@@ -173,7 +173,9 @@ TChain::TChain(const char* name, const char* title)
 
 TChain::~TChain()
 {
-   gROOT->GetListOfCleanups()->Remove(this);
+   bool rootAlive = gROOT && !gROOT->TestBit(TObject::kInvalidObject);
+
+   if (rootAlive) gROOT->GetListOfCleanups()->Remove(this);
 
    SafeDelete(fProofChain);
    fStatus->Delete();
@@ -196,10 +198,10 @@ TChain::~TChain()
    delete[] fTreeOffset;
    fTreeOffset = 0;
 
-   gROOT->GetListOfSpecials()->Remove(this);
+   if (rootAlive) gROOT->GetListOfSpecials()->Remove(this);
 
    // Remove from the global list
-   gROOT->GetListOfDataSets()->Remove(this);
+   if (rootAlive) gROOT->GetListOfDataSets()->Remove(this);
 
    // This is the same as fFile, don't delete it a second time.
    fDirectory = 0;