diff options
| author |   jsing <jsing@openbsd.org> | 2017-01-24 15:04:12 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2017-01-24 15:04:12 +0000 |
| commit | 3a878bc42145d0d699f521d1467080adc952c0af (patch) | |
| tree | 749dcd46daca012ad5115c8f7e47daedf9111cb3 /lib/libssl/ssl_cert.c | |
| parent | sk_pop_free() checks for NULL so do not bother doing it from the callers. (diff) | |
| download | wireguard-openbsd-3a878bc42145d0d699f521d1467080adc952c0af.tar.xz wireguard-openbsd-3a878bc42145d0d699f521d1467080adc952c0af.zip | |
sk_free() checks for NULL so do not bother doing it from the callers.
Diffstat (limited to 'lib/libssl/ssl_cert.c')
| -rw-r--r-- | lib/libssl/ssl_cert.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/ssl_cert.c b/lib/libssl/ssl_cert.c index 9ce8585d46f..218a55c1978 100644 --- a/lib/libssl/ssl_cert.c +++ b/lib/libssl/ssl_cert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_cert.c,v 1.59 2017/01/24 14:57:31 jsing Exp $ */ +/* $OpenBSD: ssl_cert.c,v 1.60 2017/01/24 15:04:12 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -610,12 +610,12 @@ err: sk_X509_NAME_pop_free(ret, X509_NAME_free); ret = NULL; } - if (sk != NULL) - sk_X509_NAME_free(sk); + sk_X509_NAME_free(sk); BIO_free(in); X509_free(x); if (ret != NULL) ERR_clear_error(); + return (ret); } |