Import Geant4 11.2.1 source tree

source/tracking/History

@@ -6,6 +6,11 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2023-12-11 Vladimir Ivanchenko (tracking-V11-01-03)
+- G4TrackingMessenger - fixed Coverity report on memory leak at exit by
+  move static thread local variable to be class member, because G4TrackingManager
+  and its messenger are thread local by nature.
+
 ## 2023-09-04 Gabriele Cosmo (tracking-V11-01-02)
 - Removed references to G4TouchableHistoryHandle, which is now deprecated.
 
@@ -23,7 +28,7 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 ## 2022-11-02 Vladimir Ivanchenko (tracking-V11-00-07)
 - G4SteppingManager - removed G4Exception with JustWarning severity
-    for the case if no active at rest processes exist - fix problem #2493
+  for the case if no active at rest processes exist - fix problem #2493
 
 ## 2022-06-21 Ben Morgan (tracking-V11-00-06)
 - Merge `G4SteppingManager` implementation files

source/tracking/include/G4TrackingMessenger.hh

@@ -47,6 +47,7 @@ class G4UIcmdWithAnInteger;
 class G4UIcmdWithABool;
 class G4TrackingManager;
 class G4SteppingManager;
+class G4IdentityTrajectoryFilter;
 
 class G4TrackingMessenger : public G4UImessenger
 {
@@ -59,9 +60,9 @@ class G4TrackingMessenger : public G4UImessenger
  private:
   G4TrackingManager* trackingManager = nullptr;
   G4SteppingManager* steppingManager = nullptr;
+  G4IdentityTrajectoryFilter* auxiliaryPointsFilter = nullptr;
 
   // commands
-
   G4UIdirectory* TrackingDirectory = nullptr;
   G4UIcmdWithoutParameter* AbortCmd = nullptr;
   G4UIcmdWithoutParameter* ResumeCmd = nullptr;

source/tracking/src/G4TrackingMessenger.cc

@@ -105,6 +105,7 @@ G4TrackingMessenger::~G4TrackingMessenger()
   delete ResumeCmd;
   delete StoreTrajectoryCmd;
   delete VerboseCmd;
+  delete auxiliaryPointsFilter;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -124,13 +125,13 @@ void G4TrackingMessenger::SetNewValue(G4UIcommand* command, G4String newValues)
     G4UImanager::GetUIpointer()->ApplyCommand("/control/exit");
   }
 
-  static G4ThreadLocal G4IdentityTrajectoryFilter* auxiliaryPointsFilter = nullptr;
-  if (auxiliaryPointsFilter == nullptr) {
-    auxiliaryPointsFilter = new G4IdentityTrajectoryFilter;
-  }
   if (command == StoreTrajectoryCmd) {
     G4int trajType = StoreTrajectoryCmd->ConvertToInt(newValues);
     if (trajType == 2 || trajType == 4) {
+
+      if (nullptr == auxiliaryPointsFilter) {
+	auxiliaryPointsFilter = new G4IdentityTrajectoryFilter;
+      }
       G4TransportationManager::GetTransportationManager()
         ->GetPropagatorInField()
         ->SetTrajectoryFilter(auxiliaryPointsFilter);