From 6eefebebc0f30c7c04beee4f7b4703963c7648ba Mon Sep 17 00:00:00 2001 From: doug <> Date: Sun, 19 Jul 2015 01:20:32 +0000 Subject: Remove case that can never happen. It's a little convoluted due to gotos, but at that point, pci is always NULL. Spotted by Coverity 21702. ok miod@ beck@ bcook@ --- src/lib/libcrypto/x509v3/v3_pci.c | 6 +----- src/lib/libssl/src/crypto/x509v3/v3_pci.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/x509v3/v3_pci.c b/src/lib/libcrypto/x509v3/v3_pci.c index d3f73352d9..d19f5a6e61 100644 --- a/src/lib/libcrypto/x509v3/v3_pci.c +++ b/src/lib/libcrypto/x509v3/v3_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v3_pci.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */ +/* $OpenBSD: v3_pci.c,v 1.9 2015/07/19 01:20:32 doug Exp $ */ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (richard@levitte.org) */ @@ -317,10 +317,6 @@ err: ASN1_OCTET_STRING_free(policy); policy = NULL; } - if (pci) { - PROXY_CERT_INFO_EXTENSION_free(pci); - pci = NULL; - } end: sk_CONF_VALUE_pop_free(vals, X509V3_conf_free); return pci; diff --git a/src/lib/libssl/src/crypto/x509v3/v3_pci.c b/src/lib/libssl/src/crypto/x509v3/v3_pci.c index d3f73352d9..d19f5a6e61 100644 --- a/src/lib/libssl/src/crypto/x509v3/v3_pci.c +++ b/src/lib/libssl/src/crypto/x509v3/v3_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v3_pci.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */ +/* $OpenBSD: v3_pci.c,v 1.9 2015/07/19 01:20:32 doug Exp $ */ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (richard@levitte.org) */ @@ -317,10 +317,6 @@ err: ASN1_OCTET_STRING_free(policy); policy = NULL; } - if (pci) { - PROXY_CERT_INFO_EXTENSION_free(pci); - pci = NULL; - } end: sk_CONF_VALUE_pop_free(vals, X509V3_conf_free); return pci; -- cgit v1.2.3-55-g6feb