Commit abc7a266 authored by Matt Caswell's avatar Matt Caswell
Browse files

Clarify logic in BIO_*printf functions 



The static function dynamically allocates an output buffer if the output
grows larger than the static buffer that is normally used. The original
logic implied that |currlen| could be greater than |maxlen| which is
incorrect (and if so would cause a buffer overrun). Also the original
logic would call OPENSSL_malloc to create a dynamic buffer equal to the
size of the static buffer, and then immediately call OPENSSL_realloc to
make it bigger, rather than just creating a buffer than was big enough in
the first place. Thanks to Kevin Wojtysiak (Int3 Solutions) and Paramjot
Oberoi (Int3 Solutions) for reporting this issue.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(cherry picked from commit 9d9e3774)
parent 33c99f2c

crypto/bio/b_print.c

+21 −24
Original line number Diff line number Diff line
@@ -704,11 +704,12 @@ doapr_outch(char **sbuffer, 
    /* If we haven't at least one buffer, someone has doe a big booboo */

    assert(*sbuffer != NULL || buffer != NULL);



    if (buffer) {

        while (*currlen >= *maxlen) {

    /* |currlen| must always be <= |*maxlen| */

    assert(*currlen <= *maxlen);



    if (buffer && *currlen == *maxlen) {

        *maxlen += 1024;

        if (*buffer == NULL) {

                if (*maxlen == 0)

                    *maxlen = 1024;

            *buffer = OPENSSL_malloc(*maxlen);

            if (!*buffer) {

                /* Panic! Can't really do anything sensible. Just return */
@@ -720,7 +721,6 @@ doapr_outch(char **sbuffer, 
            }

            *sbuffer = NULL;

        } else {

                *maxlen += 1024;

            *buffer = OPENSSL_realloc(*buffer, *maxlen);

            if (!*buffer) {

                /* Panic! Can't really do anything sensible. Just return */
@@ -728,9 +728,6 @@ doapr_outch(char **sbuffer, 
            }

        }

    }

        /* What to do if *buffer is NULL? */

        assert(*sbuffer != NULL || *buffer != NULL);

    }



    if (*currlen < *maxlen) {

        if (*sbuffer)