From: Ben Laurie <ben@openssl.org>
Date: Mon, 29 Dec 2008 11:54:56 +0000 (+0000)
Subject: Die earlier if hash is NULL. (Coverity IDs 137 & 138).
X-Git-Tag: OpenSSL_0_9_8k^2~84
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=85e878f224f16d21c09b1916c72ba0458335df7b;p=oweals%2Fopenssl.git

Die earlier if hash is NULL. (Coverity IDs 137 & 138).
---

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 701ac57179..96e59f678f 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -231,6 +231,8 @@ int ssl3_change_cipher_state(SSL *s, int which)
 	is_exp=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);
 	c=s->s3->tmp.new_sym_enc;
 	m=s->s3->tmp.new_hash;
+	/* m == NULL will lead to a crash later */
+	OPENSSL_assert(m);
 #ifndef OPENSSL_NO_COMP
 	if (s->s3->tmp.new_compression == NULL)
 		comp=NULL;