summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbcook <>2019-05-08 21:53:10 +0000
committerbcook <>2019-05-08 21:53:10 +0000
commit702714b4fbfab6b2dd4230cda0ce4b13e73f1d22 (patch)
treef1129a1f2175d7d9ac008e53e0c169cdf9d8f0d4 /src
parente2fd9b50b051176bc9fc27ecbc752d95d22b9959 (diff)
downloadopenbsd-702714b4fbfab6b2dd4230cda0ce4b13e73f1d22.tar.gz
openbsd-702714b4fbfab6b2dd4230cda0ce4b13e73f1d22.tar.bz2
openbsd-702714b4fbfab6b2dd4230cda0ce4b13e73f1d22.zip
initialize safestack pointers
ok beck@, tb@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509v3/v3_bcons.c4
-rw-r--r--src/lib/libcrypto/x509v3/v3_bitst.c4
-rw-r--r--src/lib/libcrypto/x509v3/v3_pmaps.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_bcons.c b/src/lib/libcrypto/x509v3/v3_bcons.c
index 9cf5793232..1626d4e786 100644
--- a/src/lib/libcrypto/x509v3/v3_bcons.c
+++ b/src/lib/libcrypto/x509v3/v3_bcons.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_bcons.c,v 1.16 2019/04/22 17:21:01 tb Exp $ */ 1/* $OpenBSD: v3_bcons.c,v 1.17 2019/05/08 21:53:10 bcook 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 1999. 3 * project 1999.
4 */ 4 */
@@ -145,7 +145,7 @@ static STACK_OF(CONF_VALUE) *
145i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, BASIC_CONSTRAINTS *bcons, 145i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, BASIC_CONSTRAINTS *bcons,
146 STACK_OF(CONF_VALUE) *extlist) 146 STACK_OF(CONF_VALUE) *extlist)
147{ 147{
148 STACK_OF(CONF_VALUE) *free_extlist; 148 STACK_OF(CONF_VALUE) *free_extlist = NULL;
149 149
150 if (extlist == NULL) { 150 if (extlist == NULL) {
151 if ((free_extlist = extlist = sk_CONF_VALUE_new_null()) == NULL) 151 if ((free_extlist = extlist = sk_CONF_VALUE_new_null()) == NULL)
diff --git a/src/lib/libcrypto/x509v3/v3_bitst.c b/src/lib/libcrypto/x509v3/v3_bitst.c
index 178131edbb..6744461754 100644
--- a/src/lib/libcrypto/x509v3/v3_bitst.c
+++ b/src/lib/libcrypto/x509v3/v3_bitst.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_bitst.c,v 1.15 2019/04/22 17:23:55 tb Exp $ */ 1/* $OpenBSD: v3_bitst.c,v 1.16 2019/05/08 21:53:10 bcook 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 1999. 3 * project 1999.
4 */ 4 */
@@ -127,7 +127,7 @@ i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, ASN1_BIT_STRING *bits,
127 STACK_OF(CONF_VALUE) *ret) 127 STACK_OF(CONF_VALUE) *ret)
128{ 128{
129 BIT_STRING_BITNAME *bnam; 129 BIT_STRING_BITNAME *bnam;
130 STACK_OF(CONF_VALUE) *free_ret; 130 STACK_OF(CONF_VALUE) *free_ret = NULL;
131 131
132 if (ret == NULL) { 132 if (ret == NULL) {
133 if ((free_ret = ret = sk_CONF_VALUE_new_null()) == NULL) 133 if ((free_ret = ret = sk_CONF_VALUE_new_null()) == NULL)
diff --git a/src/lib/libcrypto/x509v3/v3_pmaps.c b/src/lib/libcrypto/x509v3/v3_pmaps.c
index b10dfda072..37264649c8 100644
--- a/src/lib/libcrypto/x509v3/v3_pmaps.c
+++ b/src/lib/libcrypto/x509v3/v3_pmaps.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_pmaps.c,v 1.12 2019/04/22 17:32:09 tb Exp $ */ 1/* $OpenBSD: v3_pmaps.c,v 1.13 2019/05/08 21:53:10 bcook 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. 3 * project.
4 */ 4 */
@@ -148,7 +148,7 @@ static STACK_OF(CONF_VALUE) *
148i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method, void *a, 148i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method, void *a,
149 STACK_OF(CONF_VALUE) *extlist) 149 STACK_OF(CONF_VALUE) *extlist)
150{ 150{
151 STACK_OF(CONF_VALUE) *free_extlist; 151 STACK_OF(CONF_VALUE) *free_extlist = NULL;
152 POLICY_MAPPINGS *pmaps = a; 152 POLICY_MAPPINGS *pmaps = a;
153 POLICY_MAPPING *pmap; 153 POLICY_MAPPING *pmap;
154 char issuer[80], subject[80]; 154 char issuer[80], subject[80];