diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-09-07 16:17:06 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-09-07 16:18:04 -0400 |
| commit | 4d2df46cb38603c98fb49543738289c9176571d8 (patch) | |
| tree | ff3c70b0b017e6e4262af0c842d4b5783491500c /crypto/asn1 | |
| parent | 31c8b265591a0aaa462a1f3eb5770661aaac67db (diff) | |
Fix error handling/cleanup
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/4326)
(cherry picked from commit 180794c54e98ae467c4ebced3737e1ede03e320a)
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/x_name.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/crypto/asn1/x_name.c b/crypto/asn1/x_name.c index 1fb7ad1cbf..aea0c2763c 100644 --- a/crypto/asn1/x_name.c +++ b/crypto/asn1/x_name.c @@ -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) { - X509_NAME_free(*xn); - *xn = in; - } - } - return (*xn != NULL); + if ((name = X509_NAME_dup(name)) == NULL) + return 0; + X509_NAME_free(*xn); + *xn = name; + return 1; } IMPLEMENT_STACK_OF(X509_NAME_ENTRY) |