summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_srtp.c
diff options
context:
space:
mode:
authorlogan <>2014-06-28 18:05:27 +0000
committerlogan <>2014-06-28 18:05:27 +0000
commit9e895a7e0d9c1352bc40533f201a49ae796260a1 (patch)
treefeb12c0917ee62f25fdbca01f82468badafc60a8 /src/lib/libssl/d1_srtp.c
parent1e94c781aba61051bf4622c65daecc191f428832 (diff)
downloadopenbsd-9e895a7e0d9c1352bc40533f201a49ae796260a1.tar.gz
openbsd-9e895a7e0d9c1352bc40533f201a49ae796260a1.tar.bz2
openbsd-9e895a7e0d9c1352bc40533f201a49ae796260a1.zip
Fix 2 memory leaks.
(Thanks to Brent Cook) OK from tedu@
Diffstat (limited to 'src/lib/libssl/d1_srtp.c')
-rw-r--r--src/lib/libssl/d1_srtp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/d1_srtp.c b/src/lib/libssl/d1_srtp.c
index 6962a4a1ce..4a9a6b2ea8 100644
--- a/src/lib/libssl/d1_srtp.c
+++ b/src/lib/libssl/d1_srtp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: d1_srtp.c,v 1.5 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: d1_srtp.c,v 1.6 2014/06/28 18:05:27 logan Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -197,6 +197,7 @@ ssl_ctx_make_profiles(const char *profiles_string,
197 sk_SRTP_PROTECTION_PROFILE_push(profiles, p); 197 sk_SRTP_PROTECTION_PROFILE_push(profiles, p);
198 } else { 198 } else {
199 SSLerr(SSL_F_SSL_CTX_MAKE_PROFILES, SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE); 199 SSLerr(SSL_F_SSL_CTX_MAKE_PROFILES, SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE);
200 sk_SRTP_PROTECTION_PROFILE_free(profiles);
200 return 1; 201 return 1;
201 } 202 }
202 203
@@ -344,6 +345,7 @@ ssl_parse_clienthello_use_srtp_ext(SSL *s, unsigned char *d, int len, int *al)
344 if (mki_len != len) { 345 if (mki_len != len) {
345 SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT, SSL_R_BAD_SRTP_MKI_VALUE); 346 SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT, SSL_R_BAD_SRTP_MKI_VALUE);
346 *al = SSL_AD_DECODE_ERROR; 347 *al = SSL_AD_DECODE_ERROR;
348 sk_SRTP_PROTECTION_PROFILE_free(clnt);
347 return 1; 349 return 1;
348 } 350 }
349 351