Skip to content

Fixes for 5 coverity defect reports #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpiparo merged 6 commits into from
Apr 12, 2017
Merged

Fixes for 5 coverity defect reports #495

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c51ad54
file merger: fix for Coverity #89744
gganis Mar 20, 2017
8073a2f
proofd: fix for Coverity #67786
gganis Apr 10, 2017
53af0b4
stressProof: fix for coverity #62291
gganis Apr 10, 2017
5772e2d
treeplayer: fix for Coverity #12121
gganis Apr 10, 2017
c134ab2
proof: fix Coverity #66767
gganis Apr 10, 2017
5fd6176
io/tree: style-coding fixes from clang-format
gganis Apr 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
io/tree: style-coding fixes from clang-format
  • Loading branch information
@gganis
gganis committed Apr 10, 2017
commit 5fd6176765a0fc4dfce8ca1f140ec345d0f41270
2 changes: 1 addition & 1 deletion io/io/src/TFileMerger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ Bool_t TFileMerger::AddFile(TFile *source, Bool_t own, Bool_t cpProgress)
return kFALSE;
}
newfile = TFile::Open(localcopy, "READ");
// Zombie files should also be skipped
// Zombie files should also be skipped
if (newfile && newfile->IsZombie()) {
delete newfile;
newfile = 0;
Expand Down
18 changes: 9 additions & 9 deletions tree/treeplayer/src/TSelectorDraw.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ void TSelectorDraw::Begin(TTree *tree)
abrt.Form("An object of type '%s' has the same name as the requested histo (%s)", oldObject->IsA()->GetName(), hname);
Abort(abrt);
return;
delete [] varexp;
delete[] varexp;
}
if (fOldHistogram && !hnameplus) fOldHistogram->Reset(); // reset unless adding is wanted

Expand All @@ -399,7 +399,7 @@ void TSelectorDraw::Begin(TTree *tree)
abrt.Form("An object of type '%s' has the same name as the requested event list (%s)",
oldObject->IsA()->GetName(), hname);
Abort(abrt);
delete [] varexp;
delete[] varexp;
return;
}
if (!enlist) {
Expand Down Expand Up @@ -449,7 +449,7 @@ void TSelectorDraw::Begin(TTree *tree)
// We have been asked to reset the input list!!
// Let's set it aside for now ...
Abort("Input and output lists are the same!");
delete [] varexp;
delete[] varexp;
return;
}
evlist->Reset();
Expand Down Expand Up @@ -479,17 +479,17 @@ void TSelectorDraw::Begin(TTree *tree)
if (!CompileVariables(varexp, realSelection.GetTitle())) {
abrt.Form("Variable compilation failed: {%s,%s}", varexp, realSelection.GetTitle());
Abort(abrt);
delete [] varexp;
delete[] varexp;
return;
}
if (fDimension > 4 && !(optpara || optcandle || opt5d || opt.Contains("goff"))) {
Abort("Too many variables. Use the option \"para\", \"gl5d\" or \"candle\" to display more than 4 variables.");
delete [] varexp;
delete[] varexp;
return;
}
if (fDimension < 2 && (optpara || optcandle)) {
Abort("The options \"para\" and \"candle\" require at least 2 variables.");
delete [] varexp;
delete[] varexp;
return;
}

Expand Down Expand Up @@ -532,7 +532,7 @@ void TSelectorDraw::Begin(TTree *tree)
gROOT->MakeDefCanvas();
if (!gPad) {
Abort("Creation of default canvas failed");
delete [] varexp;
delete[] varexp;
return;
}
}
Expand Down Expand Up @@ -892,8 +892,8 @@ void TSelectorDraw::Begin(TTree *tree)
else if (opt5d) fAction = 8;
else fAction = 6;
}
if (varexp) delete [] varexp;
if (hnamealloc) delete [] hnamealloc;
if (varexp) delete[] varexp;
if (hnamealloc) delete[] hnamealloc;
for (i = 0; i < fValSize; ++i)
fVarMultiple[i] = kFALSE;
fSelectMultiple = kFALSE;
Expand Down