diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-11-27 16:07:34 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-11-27 16:07:34 +0000 |
| commit | 110441f619bffc9753c7892c90421bb1fe0c2c37 (patch) | |
| tree | cdfdf3bff9104ee67750a4c7e3fb2cdf43723caa | |
| parent | fe80bf9bc42c9202fb8af9fd238fa27712ca4a39 (diff) | |
Avoid a double-free in an error path.
Reported by Felix Groebert of the Google Security Team.
ok beck@ miod@
| -rw-r--r-- | lib/libssl/src/ssl/d1_srtp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libssl/src/ssl/d1_srtp.c b/lib/libssl/src/ssl/d1_srtp.c index 14439647763..eeb19a61835 100644 --- a/lib/libssl/src/ssl/d1_srtp.c +++ b/lib/libssl/src/ssl/d1_srtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_srtp.c,v 1.9 2014/11/16 14:12:47 jsing Exp $ */ +/* $OpenBSD: d1_srtp.c,v 1.10 2014/11/27 16:07:33 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -355,7 +355,6 @@ ssl_parse_clienthello_use_srtp_ext(SSL *s, unsigned char *d, int len, int *al) SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT, SSL_R_BAD_SRTP_MKI_VALUE); *al = SSL_AD_DECODE_ERROR; - sk_SRTP_PROTECTION_PROFILE_free(clnt); goto done; } |