Finish SSL_peek/SSL_pending fixes.

[openssl.git] / ssl / s2_lib.c

diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index a89958607cfd2800e03f5d0e90535891fa0ac704..a590dbfa5ca6809919d0de60aaac301a3a3bfdb5 100644 (file)
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -260,7 +260,7 @@ SSL_CIPHER *ssl2_get_cipher(unsigned int u)
 
 int ssl2_pending(SSL *s)
        {
 
 int ssl2_pending(SSL *s)
        {

-       return(s->s2->ract_data_length);
+       return SSL_in_init(s) ? 0 : s->s2->ract_data_length;

        }
 
 int ssl2_new(SSL *s)
        }
 
 int ssl2_new(SSL *s)