Commit 03cb2cc9 authored by Richard Levitte's avatar Richard Levitte
Browse files

Fix of prefix bio filter (bf_prefix.c): rely on the given length 



The assumption that the received buffer has to be NUL-terminated was
faulty.

Fault found in #5224

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5239)
parent f345b1f3

apps/bf_prefix.c

+3 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int prefix_write(BIO *b, const char *out, size_t outl, 


    *numwritten = 0;



    while (*out != '\0') {

    while (outl > 0) {

        size_t i;

        char c;
@@ -111,7 +111,7 @@ static int prefix_write(BIO *b, const char *out, size_t outl, 
        }



        /* Now, go look for the next LF, or the end of the string */

        for (i = 0; (c = out[i]) != '\n' && c != '\0'; i++)

        for (i = 0, c = '\0'; i < outl && (c = out[i]) != '\n'; i++)

            continue;

        if (c == '\n')

            i++;
@@ -123,6 +123,7 @@ static int prefix_write(BIO *b, const char *out, size_t outl, 
            if (!BIO_write_ex(BIO_next(b), out, i, &num))

                return 0;

            out += num;

            outl -= num;

            *numwritten += num;

            i -= num;

        }