summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2014-11-27 16:07:34 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2014-11-27 16:07:34 +0000
commitf0149275512665a5419a6378c2460d2924a51957 (patch)
tree904e79d1b02719f3331e280a196ba2588a1a7cd5
parent6015b6fdb4381b1419594e78e222f569117b476b (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/d1_srtp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libssl/d1_srtp.c b/lib/libssl/d1_srtp.c
index 14439647763..eeb19a61835 100644
--- a/lib/libssl/d1_srtp.c
+++ b/lib/libssl/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;
}