summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_srtp.c
diff options
context:
space:
mode:
authorjsing <>2014-11-27 16:07:33 +0000
committerjsing <>2014-11-27 16:07:33 +0000
commitd535de59dc5c181a7d99c29fd96670de7865ee1c (patch)
treec9c7516112d9b77b9f111d920e6280490dc320e9 /src/lib/libssl/d1_srtp.c
parent6cf0671671533a0aa8cb583f1d7f4f8e428268bd (diff)
downloadopenbsd-d535de59dc5c181a7d99c29fd96670de7865ee1c.tar.gz
openbsd-d535de59dc5c181a7d99c29fd96670de7865ee1c.tar.bz2
openbsd-d535de59dc5c181a7d99c29fd96670de7865ee1c.zip
Avoid a double-free in an error path.
Reported by Felix Groebert of the Google Security Team. ok beck@ miod@
Diffstat (limited to 'src/lib/libssl/d1_srtp.c')
-rw-r--r--src/lib/libssl/d1_srtp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libssl/d1_srtp.c b/src/lib/libssl/d1_srtp.c
index 1443964776..eeb19a6183 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.9 2014/11/16 14:12:47 jsing Exp $ */ 1/* $OpenBSD: d1_srtp.c,v 1.10 2014/11/27 16:07:33 jsing 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 *
@@ -355,7 +355,6 @@ ssl_parse_clienthello_use_srtp_ext(SSL *s, unsigned char *d, int len, int *al)
355 SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT, 355 SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT,
356 SSL_R_BAD_SRTP_MKI_VALUE); 356 SSL_R_BAD_SRTP_MKI_VALUE);
357 *al = SSL_AD_DECODE_ERROR; 357 *al = SSL_AD_DECODE_ERROR;
358 sk_SRTP_PROTECTION_PROFILE_free(clnt);
359 goto done; 358 goto done;
360 } 359 }
361 360