diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-01-28 15:10:27 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-01-28 15:10:27 +0000 |
| commit | 9614d2c676ffe74ce0c919d9e5c0d622a011cbed (patch) | |
| tree | a5e3f6ab40e7425dea224b616c7a33adfdacd1fc | |
| parent | ad03c71ea173680f1aa2af5cfdfbd09be47d7ef1 (diff) | |
| download | openssl-new-9614d2c676ffe74ce0c919d9e5c0d622a011cbed.tar.gz | |
Check i before r[i].
PR#3244
| -rw-r--r-- | ssl/s3_srvr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 52efed328a..9ac19c05f2 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -1830,7 +1830,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 @@ -1866,7 +1866,7 @@ int ssl3_send_server_key_exchange(SSL *s) d=(unsigned char *)s->init_buf->data; p= &(d[4]); - 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)) |