[asterisk-scf-commits] asterisk-scf/release/ice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  2124ec4b053e9f59b86bab46749361b3667d7fbc (commit)
       via  e38bccf535eec1b87fe84353d29dc964b33a8ce3 (commit)
      from  288a4c8207119505123121a7e27a01ba74dc9674 (commit)

Summary of changes:
 cpp/src/IceSSL/TransceiverI.cpp |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)


- Log -----------------------------------------------------------------
commit 2124ec4b053e9f59b86bab46749361b3667d7fbc
Merge: 288a4c8 e38bccf
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue May 31 16:37:49 2011 -0500

    Merge branch 'ice-3.4.1-patch2'


commit e38bccf535eec1b87fe84353d29dc964b33a8ce3
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue May 31 16:05:27 2011 -0500

    Import "Patch #2 for Ice 3.4.1" from ZeroC forums; corrects a memory
    leak in IceSSL for C++ (on Windows only)
    
    http://www.zeroc.com/forums/patches/5368-patch-2-ice-3-4-1-memory-leak-icessl-c-windows-only.html

diff --git a/cpp/src/IceSSL/TransceiverI.cpp b/cpp/src/IceSSL/TransceiverI.cpp
index b5994f8..26f7af1 100644
--- a/cpp/src/IceSSL/TransceiverI.cpp
+++ b/cpp/src/IceSSL/TransceiverI.cpp
@@ -116,6 +116,9 @@ IceSSL::TransceiverI::initialize()
             if(!_ssl)
             {
                 BIO_free(bio);
+#ifdef ICE_USE_IOCP
+                BIO_free(_iocpBio);
+#endif
                 SecurityException ex(__FILE__, __LINE__);
                 ex.reason = "openssl failure";
                 throw ex;
@@ -293,6 +296,14 @@ IceSSL::TransceiverI::close()
         _ssl = 0;
     }
 
+#ifdef ICE_USE_IOCP
+    if(_iocpBio)
+    {
+        BIO_free(_iocpBio);
+        _iocpBio = 0;
+    }
+#endif
+
     assert(_fd != INVALID_SOCKET);
     try
     {

-----------------------------------------------------------------------


-- 
asterisk-scf/release/ice.git