kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[PD] Add missing ctor variable init (Coverity)

Browse Source 
The "angle" variable was not being initialized in any of the
constructors for the CutDimensionSet, and nothing was being initialized
by the default constructor. This commit adds angle as an optional final
argument to the parameterized constructors, defaulting to 0.0, and adds
default values to the default constructor using the first of each enum
and 0.0 for the angle. The default constructor is required elsewhere in
the code so cannot be trivially removed. Issue identified by Coverity.
This commit is contained in:
Chris Hennes
2021-02-08 15:46:18 -06:00
committed by wwmayer
parent b76fe29412
commit ea67e77e81
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/PartDesign/App/FeatureHole.cpp
View File

@@ -1832,14 +1832,14 @@ const Hole::CutDimensionSet& Hole::find_cutDimensionSet(const CutDimensionKey &k
}
Hole::CutDimensionSet::CutDimensionSet(const std::string &nme,
std::vector<CounterBoreDimension> &&d, CutType cut, ThreadType thread) :
bore_data{ std::move(d) }, cut_type{ cut }, thread_type{thread}, name{nme}
std::vector<CounterBoreDimension> &&d, CutType cut, ThreadType thread, double a) :
bore_data{ std::move(d) }, cut_type{ cut }, thread_type{thread}, name{nme}, angle{a}
{
}
Hole::CutDimensionSet::CutDimensionSet(const std::string &nme,
std::vector<CounterSinkDimension> &&d, CutType cut, ThreadType thread) :
sink_data{ std::move(d) }, cut_type{ cut }, thread_type{thread}, name{nme}
std::vector<CounterSinkDimension> &&d, CutType cut, ThreadType thread, double a) :
sink_data{ std::move(d) }, cut_type{ cut }, thread_type{thread}, name{nme}, angle{a}
{
}

6
src/Mod/PartDesign/App/FeatureHole.h
View File

@@ -165,11 +165,11 @@ private:
enum CutType { Counterbore, Countersink };
enum ThreadType { Metric, MetricFine };
CutDimensionSet() {}
CutDimensionSet():cut_type(Counterbore),thread_type(Metric),angle(0.0) {}
CutDimensionSet(const std::string &nme,
std::vector<CounterBoreDimension> &&d, CutType cut, ThreadType thread);
std::vector<CounterBoreDimension> &&d, CutType cut, ThreadType thread, double angle = 0.0);
CutDimensionSet(const std::string &nme,
std::vector<CounterSinkDimension> &&d, CutType cut, ThreadType thread);
std::vector<CounterSinkDimension> &&d, CutType cut, ThreadType thread, double angle = 0.0);
const CounterBoreDimension &get_bore(const std::string &t) const;
const CounterSinkDimension &get_sink(const std::string &t) const;