summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-11-21 17:20:01 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-11-21 17:20:01 +0000
commit8e78548c163a0d98fac27caae5cb52060f335722 (patch)
tree93a5b7b92fcc22375ff2b4c09bdd77c5330445e4
parentb3d6e6e63a074927dd4d02a9e289137a3bf88a3a (diff)
downloadATCD-8e78548c163a0d98fac27caae5cb52060f335722.tar.gz
ChangeLogTag: Fri Nov 21 11:16:50 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/tao/DynamicAny/DynSequence_i.cpp5
2 files changed, 14 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c71afe7112d..82ab0ec74a6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Fri Nov 21 11:16:50 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * tao/DynamicAny/DynSequence_i.cpp (equal):
+
+ Added check for equal sequence length before doing the
+ member-wise comparison. Thanks to David Kinder
+ <david.kinder@sophos.com> for reporting the bug. This
+ closes [BUGID:1654].
+
Fri Nov 21 10:31:38 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/ast/ast_decl.cpp:
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 4bb6277f873..ca1e9ac6e05 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -757,6 +757,11 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs
return 0;
}
+ if (rhs->component_count () != this->component_count_)
+ {
+ return 0;
+ }
+
DynamicAny::DynAny_var tmp;
CORBA::Boolean member_equal;