diff options
| author | mmcc <> | 2016-03-11 07:08:45 +0000 |
|---|---|---|
| committer | mmcc <> | 2016-03-11 07:08:45 +0000 |
| commit | 3935f3d5bc0215b231fcd3c9f9ebd7cf653cfcde (patch) | |
| tree | b799fc9672743546b69747e9e1d53d9423de380c /src/lib/libcrypto/x509v3 | |
| parent | 611da161680b9bef86bcb6214e04eede1f25d9c4 (diff) | |
| download | openbsd-3935f3d5bc0215b231fcd3c9f9ebd7cf653cfcde.tar.gz openbsd-3935f3d5bc0215b231fcd3c9f9ebd7cf653cfcde.tar.bz2 openbsd-3935f3d5bc0215b231fcd3c9f9ebd7cf653cfcde.zip | |
X509_free(3) is NULL-safe, so remove NULL checks before its calls.
ok doug@
Diffstat (limited to 'src/lib/libcrypto/x509v3')
| -rw-r--r-- | src/lib/libcrypto/x509v3/pcy_tree.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/x509v3/pcy_tree.c b/src/lib/libcrypto/x509v3/pcy_tree.c index af9bf00c66..7b28acbe1f 100644 --- a/src/lib/libcrypto/x509v3/pcy_tree.c +++ b/src/lib/libcrypto/x509v3/pcy_tree.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pcy_tree.c,v 1.15 2015/07/18 00:01:05 beck Exp $ */ | 1 | /* $OpenBSD: pcy_tree.c,v 1.16 2016/03/11 07:08:45 mmcc Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2004. | 3 | * project 2004. |
| 4 | */ | 4 | */ |
| @@ -639,8 +639,7 @@ X509_policy_tree_free(X509_POLICY_TREE *tree) | |||
| 639 | sk_X509_POLICY_NODE_pop_free(tree->user_policies, exnode_free); | 639 | sk_X509_POLICY_NODE_pop_free(tree->user_policies, exnode_free); |
| 640 | 640 | ||
| 641 | for (i = 0, curr = tree->levels; i < tree->nlevel; i++, curr++) { | 641 | for (i = 0, curr = tree->levels; i < tree->nlevel; i++, curr++) { |
| 642 | if (curr->cert) | 642 | X509_free(curr->cert); |
| 643 | X509_free(curr->cert); | ||
| 644 | if (curr->nodes) | 643 | if (curr->nodes) |
| 645 | sk_X509_POLICY_NODE_pop_free(curr->nodes, | 644 | sk_X509_POLICY_NODE_pop_free(curr->nodes, |
| 646 | policy_node_free); | 645 | policy_node_free); |
