From 23beb8133d5c77469171fcbf6baa82999a899d86 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Mon, 22 Apr 2019 17:23:55 +0000
Subject: Add error checking to i2v_ASN1_BIT_STRING().

ok jsing
---
 src/lib/libcrypto/x509v3/v3_bitst.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/x509v3/v3_bitst.c b/src/lib/libcrypto/x509v3/v3_bitst.c
index 039faf2fd6..178131edbb 100644
--- a/src/lib/libcrypto/x509v3/v3_bitst.c
+++ b/src/lib/libcrypto/x509v3/v3_bitst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_bitst.c,v 1.14 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: v3_bitst.c,v 1.15 2019/04/22 17:23:55 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -127,12 +127,26 @@ i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, ASN1_BIT_STRING *bits,
     STACK_OF(CONF_VALUE) *ret)
 {
 	BIT_STRING_BITNAME *bnam;
+	STACK_OF(CONF_VALUE) *free_ret;
 
-	for (bnam = method->usr_data; bnam->lname; bnam++) {
-		if (ASN1_BIT_STRING_get_bit(bits, bnam->bitnum))
-			X509V3_add_value(bnam->lname, NULL, &ret);
+	if (ret == NULL) {
+		if ((free_ret = ret = sk_CONF_VALUE_new_null()) == NULL)
+			return NULL;
+	}
+
+	for (bnam = method->usr_data; bnam->lname != NULL; bnam++) {
+		if (!ASN1_BIT_STRING_get_bit(bits, bnam->bitnum))
+			continue;
+		if (!X509V3_add_value(bnam->lname, NULL, &ret))
+			goto err;
 	}
+
 	return ret;
+
+ err:
+	sk_CONF_VALUE_pop_free(free_ret, X509V3_conf_free);
+
+	return NULL;
 }
 
 ASN1_BIT_STRING *
-- 
cgit v1.2.3-55-g6feb