diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-04 16:04:33 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-04 16:04:33 +0000 |
| commit | f594da42e5b8a6823e905272c97fef8c0eb6fee0 (patch) | |
| tree | 5d699db673dc4ee73664b57e157c24948498a038 /TAO | |
| parent | f75ea22adb98832cb70ba1857a7c72a24a707c89 (diff) | |
| download | ATCD-f594da42e5b8a6823e905272c97fef8c0eb6fee0.tar.gz | |
ChangeLogTag:Fri Aug 4 08:56:14 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/tao/CONV_FRAMEC.i | 17 |
2 files changed, 16 insertions, 8 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index c41866a28e3..8d5f34a9de9 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Aug 4 08:56:14 2000 Carlos O'Ryan <coryan@uci.edu> + + * tao/CONV_FRAMEC.i: + Fixed memory leak. Thanks to Chad Elliott + <elliott_c@ociweb.com> and Paul Carreiro <pcarreir@genuity.com> + for providing the fix. + Thu Aug 3 12:46:29 2000 Carlos O'Ryan <coryan@uci.edu> * */Makefile: diff --git a/TAO/tao/CONV_FRAMEC.i b/TAO/tao/CONV_FRAMEC.i index 5d07522a858..811efdeeb48 100644 --- a/TAO/tao/CONV_FRAMEC.i +++ b/TAO/tao/CONV_FRAMEC.i @@ -43,8 +43,8 @@ CONV_FRAME::CodeSetComponent_var::operator= (const CONV_FRAME::CodeSetComponent_ if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - CONV_FRAME::CodeSetComponent (*p.ptr_), + ACE_NEW_RETURN (this->ptr_, + CONV_FRAME::CodeSetComponent (*p.ptr_), *this); } return *this; @@ -290,6 +290,7 @@ CONV_FRAME::CodeSetComponent_out::operator-> (void) { result = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->length_); this->buffer_ = result; + this->release_ = 1; } else { @@ -386,8 +387,8 @@ CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator= (const CONV_FRAM if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId (*p.ptr_), + ACE_NEW_RETURN (this->ptr_, + CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId (*p.ptr_), *this); } return *this; @@ -572,8 +573,8 @@ CONV_FRAME::CodeSetComponentInfo_var::operator= (const CONV_FRAME::CodeSetCompon if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - CONV_FRAME::CodeSetComponentInfo (*p.ptr_), + ACE_NEW_RETURN (this->ptr_, + CONV_FRAME::CodeSetComponentInfo (*p.ptr_), *this); } return *this; @@ -743,8 +744,8 @@ CONV_FRAME::CodeSetContext_var::operator= (const CONV_FRAME::CodeSetContext_var if (this != &p) { delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, - CONV_FRAME::CodeSetContext (*p.ptr_), + ACE_NEW_RETURN (this->ptr_, + CONV_FRAME::CodeSetContext (*p.ptr_), *this); } return *this; |