Commit 4d2df46c authored by Rich Salz's avatar Rich Salz
Browse files

Fix error handling/cleanup 



Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/4326)
(cherry picked from commit 180794c5)
parent 31c8b265

crypto/asn1/x_name.c

+5 −13
Original line number Diff line number Diff line
@@ -523,19 +523,11 @@ static int i2d_name_canon(STACK_OF(STACK_OF_X509_NAME_ENTRY) * _intname, 


int X509_NAME_set(X509_NAME **xn, X509_NAME *name)

{

    X509_NAME *in;



    if (!xn || !name)

        return (0);



    if (*xn != name) {

        in = X509_NAME_dup(name);

        if (in != NULL) {

    if ((name = X509_NAME_dup(name)) == NULL)

        return 0;

    X509_NAME_free(*xn);

            *xn = in;

        }

    }

    return (*xn != NULL);

    *xn = name;

    return 1;

}



IMPLEMENT_STACK_OF(X509_NAME_ENTRY)