Coverity (Gustavo)

diff --git a/STEER/AOD/AliAODCaloCells.cxx b/STEER/AOD/AliAODCaloCells.cxx
index 27e42a3439e7b0efd06d490da37a9318b0730ce3..34414c58b04d584a6e8e15867e8a6ccca84c3cd0 100644 (file)
--- a/STEER/AOD/AliAODCaloCells.cxx
+++ b/STEER/AOD/AliAODCaloCells.cxx
@@ -173,7 +173,8 @@ void AliAODCaloCells::CreateContainer(Short_t nCells)
 
   DeleteContainer();
   
-  if (nCells <= 0) {
+  if (nCells <= 0) 
+  {
     fNCells = 0;
     return;
   }
@@ -187,8 +188,13 @@ void AliAODCaloCells::CreateContainer(Short_t nCells)
   fEFraction  = new Double32_t[fNCells];
 
   // set to zero
-  for(int i = 0;i<fNCells;++i){
-    fAmplitude[i] = fCellNumber[i] = fTime[i] =fMCLabel[i] = fEFraction[i] = 0 ;
+  for(int i = 0;i<fNCells;++i)
+  {
+    fAmplitude [i] =  0.; 
+    fCellNumber[i] = -1 ; 
+    fEFraction [i] =  0.;
+    fTime      [i] = -1.;
+    fMCLabel   [i] = -1 ;
   }
 }
 
@@ -242,10 +248,14 @@ void AliAODCaloCells::Sort()
   
   Short_t    *newIndex     = new Short_t[fNCells];
   Double32_t *newAmplitude = new Double32_t[fNCells];
-  Double32_t *newTime      = new Double32_t[fNCells];
-  Short_t    *newMCLabel   = new Short_t[fNCells];
-  Double32_t *newEFraction = new Double32_t[fNCells];
-
+  
+  Double32_t *newTime      = 0; 
+  Short_t    *newMCLabel   = 0 ;
+  Double32_t *newEFraction = 0 ; 
+  if(fTime)      newTime      = new Double32_t[fNCells];
+  if(fMCLabel)   newMCLabel   = new Short_t[fNCells];
+  if(fEFraction) newEFraction = new Double32_t[fNCells];
+  
   for (Int_t i=0; i < fNCells; i++) 
   {
     newIndex[i]     = fCellNumber[idxArray[i]];
@@ -261,7 +271,6 @@ void AliAODCaloCells::Sort()
   delete [] fMCLabel;
   delete [] fEFraction;
 
-  
   fCellNumber = newIndex;
   fAmplitude  = newAmplitude;
   if(fTime)      fTime       = newTime;

diff --git a/STEER/ESD/AliESDCaloCells.cxx b/STEER/ESD/AliESDCaloCells.cxx
index a140d1933550cd2533d0c7483fe6ea01993c5619..e26efa7b27049fc64dee76c1597684bfba806f11 100644 (file)
--- a/STEER/ESD/AliESDCaloCells.cxx
+++ b/STEER/ESD/AliESDCaloCells.cxx
@@ -89,7 +89,7 @@ AliESDCaloCells & AliESDCaloCells::operator =(const AliESDCaloCells& source)
       fAmplitude  = new Double32_t[fNCells];
       fTime       = new Double32_t[fNCells];
       fMCLabel    = new Short_t[fNCells];
-      fTime       = new Double32_t[fNCells];
+      fEFraction  = new Double32_t[fNCells];
     }
     
     memcpy(fCellNumber,source.fCellNumber,fNCells*sizeof(Short_t));
@@ -174,7 +174,8 @@ void AliESDCaloCells::CreateContainer(Short_t nCells)
 
   DeleteContainer();
   
-  if (nCells <= 0) {
+  if (nCells <= 0) 
+  {
     fNCells = 0;
     return;
   }
@@ -190,8 +191,11 @@ void AliESDCaloCells::CreateContainer(Short_t nCells)
   // set to zero
   for(int i = 0;i<fNCells;++i)
   {
-    fAmplitude[i] = fCellNumber[i] = fEFraction[i] = 0 ;
-    fTime[i] = fMCLabel[i] = -1 ;
+    fAmplitude [i] =  0.; 
+    fCellNumber[i] = -1 ; 
+    fEFraction [i] =  0.;
+    fTime      [i] = -1.;
+    fMCLabel   [i] = -1 ;
   }
 }
 
@@ -246,8 +250,11 @@ void AliESDCaloCells::Sort()
   Short_t    *newIndex     = new Short_t[fNCells];
   Double32_t *newAmplitude = new Double32_t[fNCells];
   Double32_t *newTime      = new Double32_t[fNCells];
-  Short_t    *newMCLabel   = new Short_t[fNCells];
-  Double32_t *newEFraction = new Double32_t[fNCells];
+  
+  Short_t    *newMCLabel   = 0 ;
+  Double32_t *newEFraction = 0 ; 
+  if(fMCLabel)   newMCLabel   = new Short_t[fNCells];
+  if(fEFraction) newEFraction = new Double32_t[fNCells];
     
   for (Int_t i=0; i < fNCells; i++) 
   {