From: tb <tb@openbsd.org>
Date: Sun, 29 Jul 2018 20:22:02 +0000 (+0000)
Subject: Remove NULL checks before X509_{REQ,NAME}_free() and zap an unnecessary
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e1bd26f66f82269c8993c5e5f41ba13ea30dffd1;p=openbsd

Remove NULL checks before X509_{REQ,NAME}_free() and zap an unnecessary
pair of parens.

From Ross L. Richardson
---

diff --git a/usr.sbin/acme-client/keyproc.c b/usr.sbin/acme-client/keyproc.c
index 6551a03ebcf..1d18bdeb408 100644
--- a/usr.sbin/acme-client/keyproc.c
+++ b/usr.sbin/acme-client/keyproc.c
@@ -1,4 +1,4 @@
-/*	$Id: keyproc.c,v 1.10 2018/07/28 15:25:23 tb Exp $ */
+/*	$Id: keyproc.c,v 1.11 2018/07/29 20:22:02 tb Exp $ */
 /*
  * Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -252,12 +252,10 @@ out:
 	free(der64);
 	free(sans);
 	free(san);
-	if (x != NULL)
-		X509_REQ_free(x);
-	if (name != NULL)
-		X509_NAME_free(name);
+	X509_REQ_free(x);
+	X509_NAME_free(name);
 	EVP_PKEY_free(pkey);
 	ERR_print_errors_fp(stderr);
 	ERR_free_strings();
-	return (rc);
+	return rc;
 }