From 61692dfa8f6410285f6558e7c0e9df2210b71960 Mon Sep 17 00:00:00 2001
From: richterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Mon, 24 Sep 2007 09:29:52 +0000
Subject: [PATCH] bugfix: invalid index due to conditional statement

---
 HLT/TPCLib/AliHLTTPCFileHandler.cxx | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/HLT/TPCLib/AliHLTTPCFileHandler.cxx b/HLT/TPCLib/AliHLTTPCFileHandler.cxx
index 535792e6cce..dd98cfd8f32 100644
--- a/HLT/TPCLib/AliHLTTPCFileHandler.cxx
+++ b/HLT/TPCLib/AliHLTTPCFileHandler.cxx
@@ -196,13 +196,9 @@ Int_t AliHLTTPCFileHandler::LoadStaticIndex(Char_t *prefix,Int_t event)
 void AliHLTTPCFileHandler::FreeDigitsTree()
 { 
   //free digits tree
-  if(!fDigitsTree)
-    {
-      LOG(AliHLTTPCLog::kInformational,"AliHLTTPCFileHandler::FreeDigitsTree()","Pointer")
-	<<"Cannot free digitstree, it is not present"<<ENDLOG;
-      return;
-    }
-  delete fDigits;
+  if (fDigits) {
+    delete fDigits;
+  }
   fDigits=0;
   fDigitsTree=0;
 
@@ -579,12 +575,12 @@ AliHLTTPCDigitRowData * AliHLTTPCFileHandler::AliDigits2Memory(UInt_t & nrow,Int
 	tempPt->fDigitData[localcount].fTrackID[2] = fDigits->GetTrackID(time,pad,2);
 	localcount++;
       } while (fDigits->Next());
+      Byte_t *tmp = (Byte_t*)tempPt;
+      Int_t size = sizeof(AliHLTTPCDigitRowData)
+	+ ndigits[lrow]*sizeof(AliHLTTPCDigitData);
+      tmp += size;
+      tempPt = (AliHLTTPCDigitRowData*)tmp;
     }
-    Byte_t *tmp = (Byte_t*)tempPt;
-    Int_t size = sizeof(AliHLTTPCDigitRowData)
-                                      + ndigits[lrow]*sizeof(AliHLTTPCDigitData);
-    tmp += size;
-    tempPt = (AliHLTTPCDigitRowData*)tmp;
   }
   delete [] ndigits;
   return data;
-- 
2.39.3