From 0b8c418ecc6dd50c5fe730d4f25a8d4c4594d4e2 Mon Sep 17 00:00:00 2001
From: richterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 11 Feb 2011 22:54:51 +0000
Subject: [PATCH] NULL pointer protections

---
 HLT/BASE/util/AliHLTCompStatCollector.cxx |  6 +++---
 HLT/BASE/util/AliHLTMonitoringRelay.cxx   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/HLT/BASE/util/AliHLTCompStatCollector.cxx b/HLT/BASE/util/AliHLTCompStatCollector.cxx
index fee0b47d086..771856f55e2 100644
--- a/HLT/BASE/util/AliHLTCompStatCollector.cxx
+++ b/HLT/BASE/util/AliHLTCompStatCollector.cxx
@@ -389,9 +389,9 @@ int AliHLTCompStatCollector::DoEvent( const AliHLTComponentEventData& /*evtData*
       TObject* idobj=NULL;
       if (propsFolder) idobj=propsFolder->FindObject(HLTSTAT_ENTRY_PROPS_IDOBJ_NAME);
       assert(idobj);
-      AliHLTUInt32_t crcid=idobj->GetUniqueID();
-      TString idstr; idstr.Form("0x%08x", crcid);
       if (idobj) {
+	AliHLTUInt32_t crcid=idobj->GetUniqueID();
+	TString idstr; idstr.Form("0x%08x", crcid);
 	for (vector<TFolder*>::iterator consumer=publisher+1;
 	     consumer!=newFolders.end(); consumer++) {
 	  HLTDebug("   checking %s", (*consumer)->GetName());
@@ -693,7 +693,7 @@ int AliHLTCompStatCollector::RemoveRecurrence(TFolder* pRoot) const
       TFolder* token=NULL;
       while ((obj=tokens.Next())!=NULL && (token=dynamic_cast<TFolder*>(obj))!=NULL) {
 	if (name.CompareTo(token->GetName())==0) continue;
-	if ((obj=token->FindObjectAny(name))!=NULL) {
+	if (token->FindObjectAny(name)!=NULL) {
 	  listRemove.push_back(entry);
 	  HLTDebug("found recurrence in %s", token->GetName());
 	  break;
diff --git a/HLT/BASE/util/AliHLTMonitoringRelay.cxx b/HLT/BASE/util/AliHLTMonitoringRelay.cxx
index 873675b8418..525afd99dcc 100644
--- a/HLT/BASE/util/AliHLTMonitoringRelay.cxx
+++ b/HLT/BASE/util/AliHLTMonitoringRelay.cxx
@@ -230,18 +230,18 @@ int AliHLTMonitoringRelay::AliHLTMonitoringItem::SetData(void* pBuffer, int size
   if (!fData) {
     fData=new TArrayC(size, reinterpret_cast<const Char_t*>(pBuffer));
   }
+  if (!fData) {
+    return -ENOMEM;
+  }
+
   if (fData->GetSize()<size) {
     fData->Set(size, reinterpret_cast<const Char_t*>(pBuffer));
   } else {
     memcpy(fData->GetArray(), pBuffer, size);
   }
 
-  if (fData) {
-    fDataSize=size;
-    return 0;
-  }
-  return -ENOMEM;
-
+  fDataSize=size;
+  return 0;
 }
 
 
-- 
2.43.0