commit 769b386e9737fd8fe52b266f2d2760db647e4634
author David Benjamin <davidben@google.com> Thu Sep 07 17:48:05 2017 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Thu Sep 07 22:06:50 2017 +0000
tree 1aef5a56bd86b9407dc72dadb01f13d990e0a10a
parent b86be3617d4d79db9b418bed78bbf71eadd61f5c

Fix error handling/cleanup

(Imported from upstream's 4d2df46cb38603c98fb49543738289c9176571d8.)

Change-Id: I62e5d6fa58c57c4f5d30d00baf14f2024278c1de
Reviewed-on: https://boringssl-review.googlesource.com/20104
Commit-Queue: David Benjamin <davidben@google.com>
Commit-Queue: Steven Valdez <svaldez@google.com>
Reviewed-by: Steven Valdez <svaldez@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

crypto/x509/x_name.c

diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index 5fa9077..9852415 100644
--- a/crypto/x509/x_name.c
+++ b/crypto/x509/x_name.c
@@ -526,19 +526,11 @@
 
 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)