From 484549566e495cb042684cec327d66f24e6fec1d Mon Sep 17 00:00:00 2001
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Sat, 10 Aug 2002 01:46:10 +0000
Subject: Import of OpenSSL 0.9.6f.

---
 crypto/openssl/ssl/s3_clnt.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'crypto/openssl/ssl/s3_clnt.c')

diff --git a/crypto/openssl/ssl/s3_clnt.c b/crypto/openssl/ssl/s3_clnt.c
index b921d9a43d0e9..32b9cea1cabff 100644
--- a/crypto/openssl/ssl/s3_clnt.c
+++ b/crypto/openssl/ssl/s3_clnt.c
@@ -546,7 +546,11 @@ static int ssl3_client_hello(SSL *s)
 		*(p++)=i;
 		if (i != 0)
 			{
-			die(i <= sizeof s->session->session_id);
+			if (i > sizeof s->session->session_id)
+				{
+				SSLerr(SSL_F_SSL3_CLIENT_HELLO, SSL_R_INTERNAL_ERROR);
+				goto err;
+				}
 			memcpy(p,s->session->session_id,i);
 			p+=i;
 			}
-- 
cgit v1.2.3