diff options
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 54a7c898a77..cddd0166b83 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 30 15:23:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com> + + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp: + Fixed memory leak and alignment in MIOP server listerner. + Fri Nov 30 12:29:48 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * utils/nslist/nsadd.cpp: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp index 1fb5a090e1b..f3ac1799614 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp @@ -418,12 +418,12 @@ TAO_UIPMC_Mcast_Transport::handle_input ( ACE_Auto_Ptr<TAO_PG::UIPMC_Recv_Packet> owner (complete); // Create a data block. - ACE_Data_Block db (complete->data_length (), + ACE_Data_Block db (complete->data_length () + ACE_CDR::MAX_ALIGNMENT, ACE_Message_Block::MB_DATA, 0, this->orb_core_->input_cdr_buffer_allocator (), this->orb_core_->locking_strategy (), - ACE_Message_Block::DONT_DELETE, + 0, this->orb_core_->input_cdr_dblock_allocator ()); // Create a message block |