In AliMUONTriggerTrack: fixing memory leak

[u/mrichter/AliRoot.git] / PHOS / AliPHOSPIDv0.cxx

diff --git a/PHOS/AliPHOSPIDv0.cxx b/PHOS/AliPHOSPIDv0.cxx
index df3a2e165cc5b50e27e2bf53a1fe741c5754961b..05a88db220d60f2c079bb72e2284a2549b89049d 100644 (file)
--- a/PHOS/AliPHOSPIDv0.cxx
+++ b/PHOS/AliPHOSPIDv0.cxx
@@ -137,14 +137,18 @@ AliPHOSPIDv0 & AliPHOSPIDv0::operator = (const AliPHOSPIDv0 & rhs)
 {
   //Copy-assignment, emulates compiler generated, possibly wrong.
   AliPHOSPID::operator = (rhs);
-  fIDOptions = rhs.fIDOptions;
-  fClusterizer = rhs.fClusterizer;
-  fTSMaker = rhs.fTSMaker;
-  fFormula = rhs.fFormula;
-  fDispersion = rhs.fDispersion;
-  fCpvEmcDistance = rhs.fCpvEmcDistance;
-  fTimeGate = rhs.fTimeGate;
-
+  if (this != &rhs) {
+    fIDOptions = rhs.fIDOptions;
+    fClusterizer = rhs.fClusterizer;
+    fTSMaker = rhs.fTSMaker;
+    fFormula = rhs.fFormula;
+    fDispersion = rhs.fDispersion;
+    fCpvEmcDistance = rhs.fCpvEmcDistance;
+    fTimeGate = rhs.fTimeGate;
+  }
+  else {
+    AliFatal("Self assignment!");
+  }
   return *this;
 }
 
@@ -424,28 +428,28 @@ void AliPHOSPIDv0::PrintRecParticles(Option_t * option)
       Text_t particle[100];
       switch(rp->GetType()) {
       case  AliPHOSFastRecParticle::kNEUTRALEMFAST:
-       strcpy( particle, "NEUTRAL EM FAST");
+       strncpy( particle, "NEUTRAL EM FAST",100);
        break;
       case  AliPHOSFastRecParticle::kNEUTRALHAFAST:
-       strcpy(particle, "NEUTRAL HA FAST");
+       strncpy(particle, "NEUTRAL HA FAST",100);
        break;
       case  AliPHOSFastRecParticle::kNEUTRALEMSLOW:
-       strcpy(particle, "NEUTRAL EM SLOW");
+       strncpy(particle, "NEUTRAL EM SLOW",100);
        break ;
       case  AliPHOSFastRecParticle::kNEUTRALHASLOW: 
-       strcpy(particle, "NEUTRAL HA SLOW");
+       strncpy(particle, "NEUTRAL HA SLOW",100);
        break ;
       case  AliPHOSFastRecParticle::kCHARGEDEMFAST:
-       strcpy(particle, "CHARGED EM FAST") ;
+       strncpy(particle, "CHARGED EM FAST",100);
        break ;
       case  AliPHOSFastRecParticle::kCHARGEDHAFAST:
-       strcpy(particle, "CHARGED HA FAST") ;
+       strncpy(particle, "CHARGED HA FAST",100);
        break ; 
       case  AliPHOSFastRecParticle::kCHARGEDEMSLOW:
-       strcpy(particle, "CHARGEDEMSLOW") ;
+       strncpy(particle, "CHARGEDEMSLOW",100);
        break ;
       case  AliPHOSFastRecParticle::kCHARGEDHASLOW:
-       strcpy(particle, "CHARGED HA SLOW") ;
+       strncpy(particle, "CHARGED HA SLOW",100);
        break ; 
       }