Commit 01d0e241 authored by Kurt Cancemi's avatar Kurt Cancemi Committed by Matt Caswell
Browse files

crypto/x509/x509_vpm.c: Simplify int_x509_param_set1() 



This change also avoids calling strlen twice when srclen is 0

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent e2bb9b9b

crypto/x509/x509_vpm.c

+5 −6
Original line number Diff line number Diff line
@@ -259,12 +259,11 @@ static int int_x509_param_set1(char **pdest, size_t *pdestlen, 
{

    void *tmp;

    if (src) {

        if (srclen == 0) {

            tmp = OPENSSL_strdup(src);

        if (srclen == 0)

            srclen = strlen(src);

        } else



        tmp = OPENSSL_memdup(src, srclen);

        if (!tmp)

        if (tmp == NULL)

            return 0;

    } else {

        tmp = NULL;
@@ -272,7 +271,7 @@ static int int_x509_param_set1(char **pdest, size_t *pdestlen, 
    }

    OPENSSL_free(*pdest);

    *pdest = tmp;

    if (pdestlen)

    if (pdestlen != NULL)

        *pdestlen = srclen;

    return 1;

}