From 089086d30be8b3ee9f676b0e70b066b7cc045783 Mon Sep 17 00:00:00 2001 From: cblume Date: Thu, 1 Dec 2011 15:31:39 +0000 Subject: [PATCH] Coverity --- TRD/AliTRDSimParam.cxx | 46 ++++++++++++++++++++++++++++++++++++++++-- TRD/AliTRDpadPlane.cxx | 6 ++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/TRD/AliTRDSimParam.cxx b/TRD/AliTRDSimParam.cxx index 3a6ae644570..81b176bd00c 100644 --- a/TRD/AliTRDSimParam.cxx +++ b/TRD/AliTRDSimParam.cxx @@ -232,10 +232,52 @@ AliTRDSimParam &AliTRDSimParam::operator=(const AliTRDSimParam &p) // Assignment operator // - if (this != &p) { - ((AliTRDSimParam &) p).Copy(*this); + if (this == &p) { + return *this; } + fGasGain = p.fGasGain; + fNoise = p.fNoise; + fChipGain = p.fChipGain; + fADCoutRange = p.fADCoutRange; + fADCinRange = p.fADCinRange; + fADCbaseline = p.fADCbaseline; + fDiffusionOn = p.fDiffusionOn; + fElAttachOn = p.fElAttachOn; + fElAttachProp = p.fElAttachProp; + fTRFOn = p.fTRFOn; + fTRFsmp = 0; + fTRFbin = p.fTRFbin; + fTRFlo = p.fTRFlo; + fTRFhi = p.fTRFhi; + fTRFwid = p.fTRFwid; + fCTOn = p.fCTOn; + fCTsmp = 0; + fPadCoupling = p.fPadCoupling; + fTimeCoupling = p.fTimeCoupling; + fTimeStructOn = p.fTimeStructOn; + fPRFOn = p.fPRFOn; + fNTimeBins = p.fNTimeBins; + fNTBoverwriteOCDB = p.fNTBoverwriteOCDB; + + Int_t iBin = 0; + + if (fTRFsmp) { + delete[] fTRFsmp; + } + fTRFsmp = new Float_t[fTRFbin]; + for (iBin = 0; iBin < fTRFbin; iBin++) { + fTRFsmp[iBin] = ((AliTRDSimParam &) p).fTRFsmp[iBin]; + } + + if (fCTsmp) { + delete[] fCTsmp; + } + fCTsmp = new Float_t[fTRFbin]; + for (iBin = 0; iBin < fTRFbin; iBin++) { + fCTsmp[iBin] = ((AliTRDSimParam &) p).fCTsmp[iBin]; + } + return *this; } diff --git a/TRD/AliTRDpadPlane.cxx b/TRD/AliTRDpadPlane.cxx index 19927357d0f..636bac1f9bf 100644 --- a/TRD/AliTRDpadPlane.cxx +++ b/TRD/AliTRDpadPlane.cxx @@ -189,11 +189,17 @@ AliTRDpadPlane &AliTRDpadPlane::operator=(const AliTRDpadPlane &p) Int_t iBin = 0; + if (fPadRow) { + delete [] fPadRow; + } fPadRow = new Double_t[fNrows]; for (iBin = 0; iBin < fNrows; iBin++) { fPadRow[iBin] = ((AliTRDpadPlane &) p).fPadRow[iBin]; } + if (fPadCol) { + delete [] fPadCol; + } fPadCol = new Double_t[fNrows]; for (iBin = 0; iBin < fNrows; iBin++) { fPadCol[iBin] = ((AliTRDpadPlane &) p).fPadCol[iBin]; -- 2.43.5