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_0m~36
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=12cbba0d549895d2c743c4517d0a7fe2d6cac2d7;p=oweals%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 cfe40b2fa4..4f2a2715de 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1320,6 +1320,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++)