[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  fbdf0299dc98bc611d854c0a62c6ab1810d856fc (commit)
      from  9921b7b6a2b4cf8fc57213cf477275fc038fbfd1 (commit)


- Log -----------------------------------------------------------------
commit fbdf0299dc98bc611d854c0a62c6ab1810d856fc
Author: Matt Caswell <matt at openssl.org>
Date:   Thu May 5 20:59:03 2016 +0100

    Free any existing SRTP connection profile
    
    When setting a new SRTP connection profile using
    SSL_CTX_set_tlsext_use_srtp() or SSL_set_tlsext_use_srtp() we should
    free any existing profile first to avoid a memory leak.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

Summary of changes:
 ssl/d1_srtp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c
index f969fb1..e49aea9 100644
--- a/ssl/d1_srtp.c
+++ b/ssl/d1_srtp.c
@@ -197,6 +197,8 @@ static int ssl_ctx_make_profiles(const char *profiles_string,
             ptr = col + 1;
     } while (col);
 
+    sk_SRTP_PROTECTION_PROFILE_free(*out);
+
     *out = profiles;
 
     return 0;