From 13f852f88b7f59607c91ef9ac8a34ae4e55e08ca Mon Sep 17 00:00:00 2001
From: mmcc <>
Date: Fri, 11 Mar 2016 07:08:45 +0000
Subject: X509_free(3) is NULL-safe, so remove NULL checks before its calls.

ok doug@
---
 src/lib/libcrypto/asn1/x_info.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/lib/libcrypto/asn1')

diff --git a/src/lib/libcrypto/asn1/x_info.c b/src/lib/libcrypto/asn1/x_info.c
index 466deaf6ce..05ac364fa7 100644
--- a/src/lib/libcrypto/asn1/x_info.c
+++ b/src/lib/libcrypto/asn1/x_info.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_info.c,v 1.15 2015/02/10 11:22:21 jsing Exp $ */
+/* $OpenBSD: x_info.c,v 1.16 2016/03/11 07:08:44 mmcc Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -97,8 +97,7 @@ X509_INFO_free(X509_INFO *x)
 	if (i > 0)
 		return;
 
-	if (x->x509 != NULL)
-		X509_free(x->x509);
+	X509_free(x->x509);
 	if (x->crl != NULL)
 		X509_CRL_free(x->crl);
 	if (x->x_pkey != NULL)
-- 
cgit v1.2.3-55-g6feb