From b48d13565017c94523c0dc627e046bfd90b6e631 Mon Sep 17 00:00:00 2001 From: dsilverm Date: Fri, 5 Nov 2010 12:23:50 +0000 Subject: [PATCH] coverity corrections --- EMCAL/AliCaloCalibPedestal.cxx | 2 +- EMCAL/AliCaloCalibSignal.cxx | 9 ++++----- EMCAL/AliEMCALBiasAPD.cxx | 9 ++++++++- EMCAL/AliEMCALCalibAbs.cxx | 12 +++++++++--- EMCAL/AliEMCALCalibMapAPD.cxx | 9 ++++++++- EMCAL/AliEMCALCalibReference.cxx | 18 +++++++++++++++++- EMCAL/AliEMCALCalibTimeDepCorrection.cxx | 9 ++++++++- EMCAL/AliEMCALPreprocessor.cxx | 6 ++++-- 8 files changed, 59 insertions(+), 15 deletions(-) diff --git a/EMCAL/AliCaloCalibPedestal.cxx b/EMCAL/AliCaloCalibPedestal.cxx index 6d1e15776dc..15fe6056036 100644 --- a/EMCAL/AliCaloCalibPedestal.cxx +++ b/EMCAL/AliCaloCalibPedestal.cxx @@ -1069,7 +1069,7 @@ void AliCaloCalibPedestal::ComputeDeadTowers(const char * deadMapFile) } if (!diff->is_open()) { delete diff; - fout = 0;//Set the pointer to empty if the file was not opened + diff = 0;//Set the pointer to empty if the file was not opened } } diff --git a/EMCAL/AliCaloCalibSignal.cxx b/EMCAL/AliCaloCalibSignal.cxx index 07de01d5bcf..e27c7e481fb 100644 --- a/EMCAL/AliCaloCalibSignal.cxx +++ b/EMCAL/AliCaloCalibSignal.cxx @@ -162,16 +162,15 @@ AliCaloCalibSignal::AliCaloCalibSignal(const AliCaloCalibSignal &sig) : { // also the TTree contents AddInfo(&sig); - for (Int_t i = 0; i<2*fgkMaxTowers; i++) { - if(i < fgkMaxTowers){ + for (Int_t i = 0; i 0) { - sprintf(name, "profileLEDRef%d", fRefNum); + snprintf(name, buffersize, "profileLEDRef%d", fRefNum); profileLED[fRefNum] = new TProfile(name, name, numProfBins, timeMin, timeMax, "s"); } }// gain diff --git a/EMCAL/AliEMCALBiasAPD.cxx b/EMCAL/AliEMCALBiasAPD.cxx index 6610e5f873c..1814155e9a6 100644 --- a/EMCAL/AliEMCALBiasAPD.cxx +++ b/EMCAL/AliEMCALBiasAPD.cxx @@ -69,7 +69,7 @@ void AliEMCALBiasAPD::ReadTextBiasAPDInfo(Int_t nSM, const TString &txtFileName, AliEMCALSuperModuleBiasAPD * t = (AliEMCALSuperModuleBiasAPD*) fSuperModuleData[i]; if (!inputFile) { - printf("AliEMCALBiasAPD::ReadBiasAPDInfo - Error while reading input file; likely EOF.."); + printf("AliEMCALBiasAPD::ReadBiasAPDInfo - Error while reading input file; likely EOF..\n"); return; } inputFile >> iSM; @@ -78,6 +78,13 @@ void AliEMCALBiasAPD::ReadTextBiasAPDInfo(Int_t nSM, const TString &txtFileName, for (Int_t j=0; j> iCol >> iRow >> iElecId >> iDAC >> voltage; + // check that input values are not out bounds + if (iCol<0 || iCol>(AliEMCALGeoParams::fgkEMCALCols-1) || + iRow<0 || iRow>(AliEMCALGeoParams::fgkEMCALRows-1) ) { + printf("AliEMCALBiasAPD::ReadBiasAPDInfo - Error while reading input file; j %d iCol %d iRow %d\n", j, iCol, iRow); + return; + } + // assume that this info is already swapped and done for this basis? if (swapSides) { // C side, oriented differently than A side: swap is requested diff --git a/EMCAL/AliEMCALCalibAbs.cxx b/EMCAL/AliEMCALCalibAbs.cxx index a8320fefeda..828a125537b 100644 --- a/EMCAL/AliEMCALCalibAbs.cxx +++ b/EMCAL/AliEMCALCalibAbs.cxx @@ -74,7 +74,7 @@ void AliEMCALCalibAbs::ReadTextCalibAbsInfo(Int_t nSM, const TString &txtFileNam for (Int_t i = 0; i < fNSuperModule; i++) { AliEMCALSuperModuleCalibAbs * t = (AliEMCALSuperModuleCalibAbs*) fSuperModuleData[i]; if (!inputFile) { - printf("AliEMCALCalibAbs::ReadCalibAbsInfo - Error while reading input file; likely EOF.."); + printf("AliEMCALCalibAbs::ReadCalibAbsInfo - Error while reading input file; likely EOF..\n"); return; } inputFile >> iSM; @@ -88,8 +88,14 @@ void AliEMCALCalibAbs::ReadTextCalibAbsInfo(Int_t nSM, const TString &txtFileNam // third: info for each tower for (Int_t j=0; j> iCol >> iRow - >> relativeCalib; + inputFile >> iCol >> iRow >> relativeCalib; + + // check that input values are not out bounds + if (iCol<0 || iCol>(AliEMCALGeoParams::fgkEMCALCols-1) || + iRow<0 || iRow>(AliEMCALGeoParams::fgkEMCALRows-1) ) { + printf("AliEMCALCalibAbs::ReadCalibAbsInfo - Error while reading input file; j %d iCol %d iRow %d\n", j, iCol, iRow); + return; + } // assume that this info is already swapped and done for this basis? if (swapSides) { diff --git a/EMCAL/AliEMCALCalibMapAPD.cxx b/EMCAL/AliEMCALCalibMapAPD.cxx index 038b72cc86b..4e9af8fc119 100644 --- a/EMCAL/AliEMCALCalibMapAPD.cxx +++ b/EMCAL/AliEMCALCalibMapAPD.cxx @@ -74,7 +74,7 @@ void AliEMCALCalibMapAPD::ReadTextCalibMapAPDInfo(Int_t nSM, const TString &txtF for (Int_t i = 0; i < fNSuperModule; i++) { AliEMCALSuperModuleCalibMapAPD * t = (AliEMCALSuperModuleCalibMapAPD*) fSuperModuleData[i]; if (!inputFile) { - printf("AliEMCALCalibMapAPD::ReadCalibMapAPDInfo - Error while reading input file; likely EOF.."); + printf("AliEMCALCalibMapAPD::ReadCalibMapAPDInfo - Error while reading input file; likely EOF..\n"); return; } inputFile >> iSM; @@ -87,6 +87,13 @@ void AliEMCALCalibMapAPD::ReadTextCalibMapAPDInfo(Int_t nSM, const TString &txtF >> parErr[0] >> parErr[1] >> parErr[2] >> iBreakDown >> darkCurrent; + // check that input values are not out bounds + if (iCol<0 || iCol>(AliEMCALGeoParams::fgkEMCALCols-1) || + iRow<0 || iRow>(AliEMCALGeoParams::fgkEMCALRows-1) ) { + printf("AliEMCALCalibMapAPD::ReadCalibMapAPDInfo - Error while reading input file; j %d iCol %d iRow %d\n", j, iCol, iRow); + return; + } + // assume that this info is already swapped and done for this basis? if (swapSides) { // C side, oriented differently than A side: swap is requested diff --git a/EMCAL/AliEMCALCalibReference.cxx b/EMCAL/AliEMCALCalibReference.cxx index d0705f13d48..82639979c4f 100644 --- a/EMCAL/AliEMCALCalibReference.cxx +++ b/EMCAL/AliEMCALCalibReference.cxx @@ -81,7 +81,7 @@ void AliEMCALCalibReference::ReadTextCalibReferenceInfo(Int_t nSM, const TString for (Int_t i = 0; i < fNSuperModule; i++) { AliEMCALSuperModuleCalibReference * t = (AliEMCALSuperModuleCalibReference*) fSuperModuleData[i]; if (!inputFile) { - printf("AliEMCALCalibReference::ReadCalibReferenceInfo - Error while reading input file; likely EOF.."); + printf("AliEMCALCalibReference::ReadCalibReferenceInfo - Error while reading input file; likely EOF..\n"); return; } inputFile >> iSM; @@ -94,12 +94,21 @@ void AliEMCALCalibReference::ReadTextCalibReferenceInfo(Int_t nSM, const TString // second: additional info for LED Reference and SM temperature for (Int_t j=0; j> id >> iLEDRefHighLow >> rLEDRefAmp >> rLEDRefAmpRMS; + if (id<0 || id>(AliEMCALGeoParams::fgkEMCALLEDRefs-1) ) { + printf("AliEMCALCalibReference::ReadCalibReferenceInfo - Error while reading input file; LEDRef j %d id %d\n", j, id); + return; + } t->SetLEDRefHighLow(id, iLEDRefHighLow); t->SetLEDRefAmp(id, rLEDRefAmp); t->SetLEDRefAmpRMS(id, rLEDRefAmpRMS); } + for (Int_t j=0; j> id >> temperature >> temperatureRMS; + if (id<0 || id>(AliEMCALGeoParams::fgkEMCALTempSensors-1) ) { + printf("AliEMCALCalibReference::ReadCalibReferenceInfo - Error while reading input file; TempSensor j %d id %d\n", j, id); + return; + } t->SetTemperature(id, temperature); t->SetTemperatureRMS(id, temperatureRMS); } @@ -109,6 +118,13 @@ void AliEMCALCalibReference::ReadTextCalibReferenceInfo(Int_t nSM, const TString inputFile >> iCol >> iRow >> iHighLow >> rLEDAmp >> rLEDAmpRMS; + // check that input values are not out bounds + if (iCol<0 || iCol>(AliEMCALGeoParams::fgkEMCALCols-1) || + iRow<0 || iRow>(AliEMCALGeoParams::fgkEMCALRows-1) ) { + printf("AliEMCALCalibReference::ReadCalibReferenceInfo - Error while reading input file; j %d iCol %d iRow %d\n", j, iCol, iRow); + return; + } + // assume that this info is already swapped and done for this basis? if (swapSides) { // C side, oriented differently than A side: swap is requested diff --git a/EMCAL/AliEMCALCalibTimeDepCorrection.cxx b/EMCAL/AliEMCALCalibTimeDepCorrection.cxx index e87ea54610a..9f210ea2171 100644 --- a/EMCAL/AliEMCALCalibTimeDepCorrection.cxx +++ b/EMCAL/AliEMCALCalibTimeDepCorrection.cxx @@ -122,7 +122,7 @@ void AliEMCALCalibTimeDepCorrection::ReadTextInfo(Int_t nSM, const TString &txtF AliEMCALSuperModuleCalibTimeDepCorrection * t = (AliEMCALSuperModuleCalibTimeDepCorrection*) fSuperModuleData[i]; if (!inputFile) { - printf("AliEMCALCalibTimeDepCorrection::ReadTextInfo - Error while reading input file; likely EOF.."); + printf("AliEMCALCalibTimeDepCorrection::ReadTextInfo - Error while reading input file; likely EOF..\n"); return; } inputFile >> iSM; @@ -131,6 +131,13 @@ void AliEMCALCalibTimeDepCorrection::ReadTextInfo(Int_t nSM, const TString &txtF for (Int_t j=0; j> iCol >> iRow >> nCorr; + // check that input values are not out bounds + if (iCol<0 || iCol>(AliEMCALGeoParams::fgkEMCALCols-1) || + iRow<0 || iRow>(AliEMCALGeoParams::fgkEMCALRows-1) ) { + printf("AliEMCALCalibTimeDepCorrection::ReadTextInfo - Error while reading input file; j %d iCol %d iRow %d\n", j, iCol, iRow); + return; + } + // assume that this info is already swapped and done for this basis? if (swapSides) { // C side, oriented differently than A side: swap is requested diff --git a/EMCAL/AliEMCALPreprocessor.cxx b/EMCAL/AliEMCALPreprocessor.cxx index cf951e6a4b5..4f7056292fa 100644 --- a/EMCAL/AliEMCALPreprocessor.cxx +++ b/EMCAL/AliEMCALPreprocessor.cxx @@ -257,9 +257,11 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap) metaData.SetBeamPeriod(0); metaData.SetResponsible(kMetaResponsible); metaData.SetComment("Preprocessor AliEMCAL status."); - Store("Calib", "PreprocStatus", resultArray, &metaData, 0, kFALSE); + Bool_t storeOK = Store("Calib", "PreprocStatus", resultArray, &metaData, 0, kFALSE); resultArray->Delete(); - return 0; + result = 0; + if ( !storeOK ) result=1; + return result; } else { return result; -- 2.39.3