diff options
author | mmcc <> | 2016-03-11 07:08:45 +0000 |
---|---|---|
committer | mmcc <> | 2016-03-11 07:08:45 +0000 |
commit | 13f852f88b7f59607c91ef9ac8a34ae4e55e08ca (patch) | |
tree | b799fc9672743546b69747e9e1d53d9423de380c /src/lib/libcrypto/x509/by_file.c | |
parent | e11a59757e997c4effb65f1ad3aa27df9dff42f5 (diff) | |
download | openbsd-13f852f88b7f59607c91ef9ac8a34ae4e55e08ca.tar.gz openbsd-13f852f88b7f59607c91ef9ac8a34ae4e55e08ca.tar.bz2 openbsd-13f852f88b7f59607c91ef9ac8a34ae4e55e08ca.zip |
X509_free(3) is NULL-safe, so remove NULL checks before its calls.
ok doug@
Diffstat (limited to 'src/lib/libcrypto/x509/by_file.c')
-rw-r--r-- | src/lib/libcrypto/x509/by_file.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c index 68920271fc..377b3b0a8b 100644 --- a/src/lib/libcrypto/x509/by_file.c +++ b/src/lib/libcrypto/x509/by_file.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: by_file.c,v 1.19 2015/04/11 16:03:21 deraadt Exp $ */ | 1 | /* $OpenBSD: by_file.c,v 1.20 2016/03/11 07:08:45 mmcc Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -172,8 +172,7 @@ X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type) | |||
172 | goto err; | 172 | goto err; |
173 | } | 173 | } |
174 | err: | 174 | err: |
175 | if (x != NULL) | 175 | X509_free(x); |
176 | X509_free(x); | ||
177 | BIO_free(in); | 176 | BIO_free(in); |
178 | return (ret); | 177 | return (ret); |
179 | } | 178 | } |