diff options
author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-03-07 15:26:40 +0000 |
---|---|---|
committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-03-07 15:26:40 +0000 |
commit | 229868824299b78bbd15207f3888752296a54091 (patch) | |
tree | 1fd8a1f1d9edf4b92c18f62f1398fd16fd70f63a /TAO/tao/DynamicAny | |
parent | a045278199c1b0b2a9439feefb98549adac37f91 (diff) | |
download | ATCD-229868824299b78bbd15207f3888752296a54091.tar.gz |
Wed Mar 7 15:27:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com>
Coverity problems corrected
Diffstat (limited to 'TAO/tao/DynamicAny')
-rw-r--r-- | TAO/tao/DynamicAny/DynCommon.cpp | 8 | ||||
-rw-r--r-- | TAO/tao/DynamicAny/DynEnum_i.cpp | 1 | ||||
-rw-r--r-- | TAO/tao/DynamicAny/DynUnion_i.cpp | 1 | ||||
-rw-r--r-- | TAO/tao/DynamicAny/DynValueBox_i.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/DynamicAny/DynValueCommon_i.cpp | 1 |
5 files changed, 12 insertions, 3 deletions
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index 3438fc983f6..a6989e68680 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -26,7 +26,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynCommon::TAO_DynCommon (CORBA::Boolean allow_truncation) - : allow_truncation_ (allow_truncation) + : ref_to_component_ (false) + , container_is_destroying_ (false) + , has_components_ (false) + , destroyed_ (false) + , current_position_ (-1) + , component_count_ (0) + , allow_truncation_ (allow_truncation) { } diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp index 76298dc8e53..3df1b8365ad 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.cpp +++ b/TAO/tao/DynamicAny/DynEnum_i.cpp @@ -14,6 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynEnum_i::TAO_DynEnum_i (CORBA::Boolean allow_truncation) : TAO_DynCommon (allow_truncation) + , value_ (0u) { } diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index b19832b4ceb..2916277ea96 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -16,6 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynUnion_i::TAO_DynUnion_i (CORBA::Boolean allow_truncation) : TAO_DynCommon (allow_truncation) + , member_slot_ (0u) { } diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp index 1b0346c708a..e083f67eba5 100644 --- a/TAO/tao/DynamicAny/DynValueBox_i.cpp +++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynValueBox_i::TAO_DynValueBox_i (CORBA::Boolean allow_truncation) : TAO_DynCommon (allow_truncation) - , TAO_DynAny_i(allow_truncation) + , TAO_DynAny_i (allow_truncation) , TAO_DynValueCommon_i (allow_truncation) { } @@ -202,7 +202,7 @@ TAO_DynValueBox_i::equal (DynamicAny::DynAny_ptr rhs) DynamicAny::DynValueBox_ptr rhs_v= dynamic_cast<DynamicAny::DynValueBox_ptr> (rhs); - if (this->is_null () != rhs_v->is_null ()) + if (!rhs_v || this->is_null () != rhs_v->is_null ()) { return false; } diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.cpp b/TAO/tao/DynamicAny/DynValueCommon_i.cpp index 76373fb3aec..3f0d17f94c8 100644 --- a/TAO/tao/DynamicAny/DynValueCommon_i.cpp +++ b/TAO/tao/DynamicAny/DynValueCommon_i.cpp @@ -15,6 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynValueCommon_i::TAO_DynValueCommon_i (CORBA::Boolean allow_truncation) : TAO_DynCommon (allow_truncation) , TAO_DynAny_i (allow_truncation) + , is_null_ (true) { } |