From: Kurt Roeckx <kurt@roeckx.be>
Date: Mon, 12 May 2014 16:19:14 +0000 (+0200)
Subject: Check sk_SSL_CIPHER_num() after assigning sk.
X-Git-Tag: OpenSSL_1_0_2-beta2~214
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1f5bce2dcebbb5059c2a5ecf4037432e8041cc07;p=oweals%2Fopenssl.git

Check sk_SSL_CIPHER_num() after assigning sk.
---

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 0a7e2aad2d..00b26ba429 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1467,11 +1467,12 @@ char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
 		(len < 2))
 		return(NULL);
 
+	p=buf;
+	sk=s->session->ciphers;
+
 	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++)
 		{
 		int n;