Commit a99540a6 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Check i before r[i]. 

PR#3244
(cherry picked from commit 9614d2c6)
parent 9614ed69

ssl/s3_srvr.c

+2 −2
Original line number Diff line number Diff line
@@ -1878,7 +1878,7 @@ int ssl3_send_server_key_exchange(SSL *s) 
			SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);

			goto f_err;

			}

		for (i=0; r[i] != NULL && i<4; i++)

		for (i=0; i < 4 && r[i] != NULL; i++)

			{

			nr[i]=BN_num_bytes(r[i]);

#ifndef OPENSSL_NO_SRP
@@ -1913,7 +1913,7 @@ int ssl3_send_server_key_exchange(SSL *s) 
			}

		d = p = ssl_handshake_start(s);



		for (i=0; r[i] != NULL && i<4; i++)

		for (i=0; i < 4 && r[i] != NULL; i++)

			{

#ifndef OPENSSL_NO_SRP

			if ((i == 2) && (type & SSL_kSRP))