Commit 575c69f9 authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Swap the check in ssl3_write_pending to avoid using 


the possibly indeterminate pointer value in wpend_buf.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5309)
parent 48081cf9

ssl/s3_pkt.c

+2 −3
Original line number Diff line number Diff line
@@ -1096,10 +1096,9 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf, 
    int i;

    SSL3_BUFFER *wb = &(s->s3->wbuf);



/* XXXX */

    if ((s->s3->wpend_tot > (int)len)

        || ((s->s3->wpend_buf != buf) &&

            !(s->mode & SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER))

        || (!(s->mode & SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER)

            && (s->s3->wpend_buf != buf))

        || (s->s3->wpend_type != type)) {

        SSLerr(SSL_F_SSL3_WRITE_PENDING, SSL_R_BAD_WRITE_RETRY);

        return (-1);