Commit 0791bef0 authored by Rich Salz's avatar Rich Salz
Browse files

Undo commit 40720ce3 



Comment in the commit:
    /* Ignore NULLs, thanks to Bob Beck <beck@obtuse.com> */

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3700)
parent 810ef917

crypto/err/err.c

+9 −12
Original line number Diff line number Diff line
@@ -757,8 +757,6 @@ void ERR_add_error_vdata(int num, va_list args) 
    n = 0;

    for (i = 0; i < num; i++) {

        a = va_arg(args, char *);

        /* ignore NULLs, thanks to Bob Beck <beck@obtuse.com> */

        if (a != NULL) {

        n += strlen(a);

        if (n > s) {

            s = n + 20;
@@ -771,7 +769,6 @@ void ERR_add_error_vdata(int num, va_list args) 
        }

        OPENSSL_strlcat(str, a, (size_t)s + 1);

    }

    }

    ERR_set_error_data(str, ERR_TXT_MALLOCED | ERR_TXT_STRING);

}