[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  4118dfdcc8aa2c2cf496bb33cbc1b9581c33af2f (commit)
      from  30f54ad295d58ff8c6d28c1fd612d23c2c343d19 (commit)


- Log -----------------------------------------------------------------
commit 4118dfdcc8aa2c2cf496bb33cbc1b9581c33af2f
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Apr 10 15:33:45 2015 +0100

    Fix read_ahead issue
    
    Fix a "&" that should have been "!" when processing read_ahead.
    
    RT#3793
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/record/rec_layer_s3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index de8dac2..0ec1d2c 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -380,7 +380,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
     }
 
     /* We always act like read_ahead is set for DTLS */
-    if (&s->rlayer.read_ahead && !SSL_IS_DTLS(s))
+    if (!s->rlayer.read_ahead && !SSL_IS_DTLS(s))
         /* ignore max parameter */
         max = n;
     else {