Protect late destructor call to FileSystem

ROOT indirectly binds the destruction of a FileSystem to a the global gROOT. This can lead to the ForkHandler being deleted before the FileSystem is deleted.
cms-externals · Oct 16, 2014 · 258e689 · 258e689
1 parent 7ed10c7
commit 258e689
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/XrdCl/XrdClFileSystem.cc b/src/XrdCl/XrdClFileSystem.cc
@@ -344,8 +344,11 @@ namespace XrdCl
   //----------------------------------------------------------------------------
   FileSystem::~FileSystem()
   {
-    if( !pPlugIn )
-      DefaultEnv::GetForkHandler()->UnRegisterFileSystemObject( this );
+    if( !pPlugIn ) {
+      ForkHandler* handler = DefaultEnv::GetForkHandler();
+      if( handler ) 
+	handler->UnRegisterFileSystemObject( this );
+    }
     delete pUrl;
     delete pPlugIn;
   }