Skip to content

More coverity fixes #579

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
xvallspl merged 5 commits into from
Nov 21, 2017
Merged

More coverity fixes #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f46f1a
coverity 61245,61267,61266,61268,61300: fix 3 bugs leading to logical…
harveyj1953 May 4, 2017
bc5aab4
coverity 61601: fix uninitialised arrays 2 times
harveyj1953 May 4, 2017
cab5f11
coverity 61594: uninitialised scalar field
harveyj1953 May 4, 2017
b99101f
coverity 61580,61536,61539: uninitialised pointer arrays
harveyj1953 May 4, 2017
0c9b049
reverting coverity fix on Axel's suggestion
harveyj1953 May 18, 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
15 changes: 8 additions & 7 deletions hist/hist/src/TFormula_v5.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ TFormula::TFormula(): TNamed()
fOperOptimized = 0;
fOperOffset = 0;
fPredefined = 0;
fOptimal = (ROOT::v5::TFormulaPrimitive::TFuncG)&TFormula::EvalParOld;
Copy link
Member

@Axel-Naumann Axel-Naumann May 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we have these changes? Are they only whitespace changes?

fOptimal = (ROOT::v5::TFormulaPrimitive::TFuncG)&TFormula::EvalParOld;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -180,7 +180,7 @@ TFormula::TFormula(const char *name,const char *expression) :
fOperOptimized = 0;
fOperOffset = 0;
fPredefined = 0;
fOptimal = (ROOT::v5::TFormulaPrimitive::TFuncG)&TFormula::EvalParOld;
fOptimal = (ROOT::v5::TFormulaPrimitive::TFuncG)&TFormula::EvalParOld;

if (!expression || !*expression) {
Error("TFormula", "expression may not be 0 or have 0 length");
Expand Down Expand Up @@ -290,6 +290,7 @@ TFormula::TFormula(const TFormula &formula) : TNamed()
fOperOffset = 0;
fExprOptimized = 0;
fOperOptimized = 0;
fOptimal = (ROOT::v5::TFormulaPrimitive::TFuncG)&TFormula::EvalParOld;

((TFormula&)formula).TFormula::Copy(*this);
}
Expand Down Expand Up @@ -2686,9 +2687,9 @@ Double_t TFormula::EvalParOld(const Double_t *x, const Double_t *uparams)
Int_t i,j;
// coverity[uninit] the tab value of tab is guaranteed to be set properly by the control flow.
Double_t tab[kMAXFOUND];
const char *stringStack[gMAXSTRINGFOUND];
const char *stringStack[gMAXSTRINGFOUND] = {0};
Double_t param_calc[kMAXFOUND];
char *string_calc[gMAXSTRINGFOUND];
char *string_calc[gMAXSTRINGFOUND] = {0};
Int_t precalculated = 0;
Int_t precalculated_str = 0;
Double_t *params;
Expand Down Expand Up @@ -4188,10 +4189,10 @@ Double_t TFormula::EvalParFast(const Double_t *x, const Double_t *uparams)
const Double_t *pdata[3] = {x,(uparams!=0)?uparams:fParams, fConst};
//
Int_t i,j;
Double_t tab[kMAXFOUND];
const char *stringStack[gMAXSTRINGFOUND];
Double_t tab[kMAXFOUND] = {0};
const char *stringStack[gMAXSTRINGFOUND] = {0};
Double_t param_calc[kMAXFOUND];
char *string_calc[gMAXSTRINGFOUND];
char *string_calc[gMAXSTRINGFOUND] = {0};
Int_t precalculated = 0;
Int_t precalculated_str = 0;

Expand Down
18 changes: 9 additions & 9 deletions test/stressVector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ double testAddition( const std::vector<V *> & dataV, TStopwatch & tim, double& t
for (unsigned int j = i +1; j < n; ++j) {
V & v2 = *(dataV[j]);
V v3 = v1 + v2;
if (i % 1) {
tot += v3.E();
if (i % 2) {
tot += v3.E();
} else {
tot -= v3.E();
tot -= v3.E();
}
}
}
Expand All @@ -214,10 +214,10 @@ double testScale( const std::vector<V *> & dataV, TStopwatch & tim, double& t,
V & v1 = *(dataV[i]);
// scale
v1 = 2.0*v1;
if (i % 1) {
tot += v1.E();
if (i % 2) {
tot += v1.E();
} else {
tot -= v1.E();
tot -= v1.E();
}
}
tim.Stop();
Expand Down Expand Up @@ -255,10 +255,10 @@ double testDeltaR( const std::vector<V *> & dataV, TStopwatch & tim, double& t,
for (unsigned int j = i +1; j < n; ++j) {
V & v2 = *(dataV[j]);
double delta = VectorUtil::DeltaR(v1,v2);
if (i % 1) {
tot += delta;
if (i % 2) {
tot += delta;
} else {
tot -= delta;
tot -= delta;
}
}
}
Expand Down
1 change: 1 addition & 0 deletions tmva/tmva/src/Config.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ TMVA::Config::Config() :

fVariablePlotting.fNbinsMVAoutput = 40;
fVariablePlotting.fNbinsXOfROCCurve = 100;
fVariablePlotting.fUsePaperStyle = 0;

// IO names
fIONames.fWeightFileDir = "weights";
Expand Down