From: Günther Noack <gnoack@google.com>
Date: Thu, 1 May 2014 11:33:11 +0000 (+0200)
Subject: Avoid out-of-bounds write in SSL_get_shared_ciphers
X-Git-Tag: OpenSSL_1_0_1h~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15c1ac03c8d23362940ce2809925598497098eae;p=thirdparty%2Fopenssl.git

Avoid out-of-bounds write in SSL_get_shared_ciphers

PR: 3317
---

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 6dbc3c1f7d0..6e2711afa6a 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1347,6 +1347,9 @@ char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
 		(len < 2))
 		return(NULL);
 
+	if (sk_SSL_CIPHER_num(sk) == 0)
+		return NULL;
+
 	p=buf;
 	sk=s->session->ciphers;
 	for (i=0; i<sk_SSL_CIPHER_num(sk); i++)