From 1c9853d38148faa396985872872eff15ba4fd11c Mon Sep 17 00:00:00 2001
From: richterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 23 Feb 2011 10:50:54 +0000
Subject: [PATCH] using safe string oparations, pointer checks

---
 HLT/TPCLib/AliHLTTPCGlobalMerger.cxx | 5 +++--
 HLT/TPCLib/AliHLTTPCInterMerger.cxx  | 7 ++++---
 HLT/TPCLib/AliHLTTPCTrackMerger.cxx  | 5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/HLT/TPCLib/AliHLTTPCGlobalMerger.cxx b/HLT/TPCLib/AliHLTTPCGlobalMerger.cxx
index 456ac325d88..577b70ead3a 100644
--- a/HLT/TPCLib/AliHLTTPCGlobalMerger.cxx
+++ b/HLT/TPCLib/AliHLTTPCGlobalMerger.cxx
@@ -235,8 +235,9 @@ void AliHLTTPCGlobalMerger::SlowMerge(const Char_t *path)
 	<<AliHLTTPCLog::kDec<<"Merged Tracks: "<<tout->GetNTracks()<<" at:"
 	<<angle<<ENDLOG;
     }
-  Char_t fname[1024];
-  sprintf(fname,"%s/merge_parameters.root",path);
+  const int namelen=1024;
+  Char_t fname[namelen];
+  snprintf(fname,namelen,"%s/merge_parameters.root",path);
   WriteNtuple(fname,ntuple);
 }
 
diff --git a/HLT/TPCLib/AliHLTTPCInterMerger.cxx b/HLT/TPCLib/AliHLTTPCInterMerger.cxx
index f4bd29a136f..7e1cc4041ba 100644
--- a/HLT/TPCLib/AliHLTTPCInterMerger.cxx
+++ b/HLT/TPCLib/AliHLTTPCInterMerger.cxx
@@ -64,7 +64,7 @@ void AliHLTTPCInterMerger::SlowMerge(){
   AliHLTTPCTrack *tr[2];
   Bool_t merge = kTRUE;
   for(Int_t in=0;in<kNIn;in++)
-    tracks->GetCheckedTrack(in)->CalculateHelix();
+    if (tracks->GetCheckedTrack(in)) tracks->GetCheckedTrack(in)->CalculateHelix();
   while(merge){
     Int_t inmin=-1,outmin=-1;
     Double_t min=10;
@@ -105,8 +105,9 @@ void AliHLTTPCInterMerger::SlowMerge(){
   LOG(AliHLTTPCLog::kInformational,"AliHLTTPCInterMerger::SlowMerge","Result")
   <<AliHLTTPCLog::kDec<<"Merged Tracks: "<<tracks->GetNTracks()-kNIn<<ENDLOG;
 
-  char name[256];
-  sprintf(name,"ntuple_i_%d.root",fPatch);
+  const int namelen=256;
+  char name[namelen];
+  snprintf(name,namelen,"ntuple_i_%d.root",fPatch);
   WriteNtuple(name,ntuple);
 }
 
diff --git a/HLT/TPCLib/AliHLTTPCTrackMerger.cxx b/HLT/TPCLib/AliHLTTPCTrackMerger.cxx
index 7c4fb622dd6..2655c016f38 100644
--- a/HLT/TPCLib/AliHLTTPCTrackMerger.cxx
+++ b/HLT/TPCLib/AliHLTTPCTrackMerger.cxx
@@ -144,10 +144,11 @@ void AliHLTTPCTrackMerger::SlowMerge(AliHLTTPCTrackArray *mergedtrack,AliHLTTPCT
   LOG(AliHLTTPCLog::kInformational,"AliHLTTPCTrackMerger::SlowMerge","Result")
   <<AliHLTTPCLog::kDec<<"Merged Tracks: "
   <<mergedtrack->GetNTracks()-kNMerged<<ENDLOG;
-  char name[256] = "ntuple_t.root";
+  const int namelen=256;
+  char name[namelen] = "ntuple_t.root";
   for(Int_t i=0;i<4;i++)
     if(tracksin==GetInTracks(i))
-      sprintf(name,"ntuple_t_%d.root",i);
+      snprintf(name,namelen,"ntuple_t_%d.root",i);
   WriteNtuple(name,ntuple);
 }
 
-- 
2.43.0