NULL pointer protections

diff --git a/HLT/BASE/util/AliHLTCompStatCollector.cxx b/HLT/BASE/util/AliHLTCompStatCollector.cxx
index fee0b47d08689022c51a6751844883ea309638be..771856f55e2a1e233da25966f1a0324d30503405 100644 (file)
--- 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 873675b841861cd093538e1da6ac47a3c2adcf26..525afd99dcc9de4aa1c6a44d569e64948f983feb 100644 (file)
--- 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;
 }