summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_cert.c
diff options
context:
space:
mode:
authorjsing <>2017-01-24 15:04:12 +0000
committerjsing <>2017-01-24 15:04:12 +0000
commitfa12c318978281dc18c0d5d00a977e1b12436659 (patch)
treefb6b6ff3ecbc97ee4bea29ec3959e5b5d8a7dc8f /src/lib/libssl/ssl_cert.c
parent77a92585c62f2350be59692b9661aa7682960754 (diff)
downloadopenbsd-fa12c318978281dc18c0d5d00a977e1b12436659.tar.gz
openbsd-fa12c318978281dc18c0d5d00a977e1b12436659.tar.bz2
openbsd-fa12c318978281dc18c0d5d00a977e1b12436659.zip
sk_free() checks for NULL so do not bother doing it from the callers.
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
-rw-r--r--src/lib/libssl/ssl_cert.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index 9ce8585d46..218a55c197 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_cert.c,v 1.59 2017/01/24 14:57:31 jsing Exp $ */ 1/* $OpenBSD: ssl_cert.c,v 1.60 2017/01/24 15:04:12 jsing 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 *
@@ -610,12 +610,12 @@ err:
610 sk_X509_NAME_pop_free(ret, X509_NAME_free); 610 sk_X509_NAME_pop_free(ret, X509_NAME_free);
611 ret = NULL; 611 ret = NULL;
612 } 612 }
613 if (sk != NULL) 613 sk_X509_NAME_free(sk);
614 sk_X509_NAME_free(sk);
615 BIO_free(in); 614 BIO_free(in);
616 X509_free(x); 615 X509_free(x);
617 if (ret != NULL) 616 if (ret != NULL)
618 ERR_clear_error(); 617 ERR_clear_error();
618
619 return (ret); 619 return (ret);
620} 620}
621 621