From 769b386e9737fd8fe52b266f2d2760db647e4634 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Thu, 7 Sep 2017 17:48:05 -0400 Subject: [PATCH] Fix error handling/cleanup (Imported from upstream's 4d2df46cb38603c98fb49543738289c9176571d8.) Change-Id: I62e5d6fa58c57c4f5d30d00baf14f2024278c1de Reviewed-on: https://boringssl-review.googlesource.com/20104 Commit-Queue: David Benjamin Commit-Queue: Steven Valdez Reviewed-by: Steven Valdez CQ-Verified: CQ bot account: commit-bot@chromium.org --- crypto/x509/x_name.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c index 5fa9077b..9852415c 100644 --- a/crypto/x509/x_name.c +++ b/crypto/x509/x_name.c @@ -526,19 +526,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_ASN1_SET_OF(X509_NAME_ENTRY)