diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2021-07-08 20:22:38 -0500 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2021-07-08 20:22:53 -0500 |
| commit | 1252f0d1f1ea2182759b029871a3ca2a7994256b (patch) | |
| tree | 3da7f5678ced1880a2c44bdb88ca1ba1b406033f | |
| parent | a0cea31f31479ba6ef6ee9adff63f8f164779821 (diff) | |
| download | ATCD-1252f0d1f1ea2182759b029871a3ca2a7994256b.tar.gz | |
ast_expression.cpp: Fix Uninitialized Value
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_expression.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp index 1ff1d52a1cf..f54b659bb16 100644 --- a/TAO/TAO_IDL/ast/ast_expression.cpp +++ b/TAO/TAO_IDL/ast/ast_expression.cpp @@ -940,8 +940,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, return nullptr; } - ev->u.llval = - static_cast<ACE_CDR::LongLong> (ev->u.ullval); + tmp.llval = static_cast<ACE_CDR::LongLong> (ev->u.ullval); break; case AST_Expression::EV_bool: tmp.llval = (ACE_CDR::LongLong) ev->u.bval; @@ -1015,8 +1014,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, return nullptr; } - ev->u.ullval = - static_cast<ACE_CDR::LongLong> (ev->u.llval); + tmp.ullval = static_cast<ACE_CDR::LongLong> (ev->u.llval); break; case AST_Expression::EV_bool: tmp.ullval = ev->u.bval; @@ -1083,7 +1081,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, case AST_Expression::EV_longlong: tmp.bval = (ev->u.llval == 0) ? false : true; break; - case AST_Expression::EV_ulonglong: + case AST_Expression::EV_ulonglong: tmp.bval = (ev->u.ullval == 0) ? false : true; break; case AST_Expression::EV_float: @@ -1271,8 +1269,8 @@ coerce_value (AST_Expression::AST_ExprValue *ev, tmp.cval = (ACE_CDR::Char) ev->u.llval; break; - case AST_Expression::EV_ulonglong: - if (( ev->u.ullval & ACE_CHAR_MAX) != ev->u.ullval) + case AST_Expression::EV_ulonglong: + if ((ev->u.ullval & ACE_CHAR_MAX) != ev->u.ullval) { return nullptr; } @@ -1367,7 +1365,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, tmp.wcval = (ACE_CDR::WChar) ev->u.llval; break; case AST_Expression::EV_ulonglong: - if ((ev->u.ullval & ACE_WCHAR_MAX) != ev->u.ullval ) + if ((ev->u.ullval & ACE_WCHAR_MAX) != ev->u.ullval) { return nullptr; } @@ -1977,7 +1975,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) this->pd_v1->set_ev (this->pd_v1->eval_internal (ek)); this->pd_v2->set_ev (this->pd_v2->eval_internal (ek)); - if (this->pd_v1->ev () == nullptr || this->pd_v2->ev () == nullptr ) + if (this->pd_v1->ev () == nullptr || this->pd_v2->ev () == nullptr) { return nullptr; } |