From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 5 Nov 2002 13:48:33 +0000 (+0000)
Subject: Check for NULL ASN1_ITEM when initializeing
X-Git-Tag: OpenSSL_0_9_7-beta4~18^2~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38c7271a39224cf91b9c6452e3c1107df932d750;p=thirdparty%2Fopenssl.git

Check for NULL ASN1_ITEM when initializeing
boolean option in ASN1_TYPE.
---

diff --git a/crypto/asn1/tasn_fre.c b/crypto/asn1/tasn_fre.c
index 910f9b4f262..30096a0bcfa 100644
--- a/crypto/asn1/tasn_fre.c
+++ b/crypto/asn1/tasn_fre.c
@@ -207,7 +207,10 @@ void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 		break;
 
 		case V_ASN1_BOOLEAN:
-		*(ASN1_BOOLEAN *)pval = it->size;
+		if (it)
+			*(ASN1_BOOLEAN *)pval = it->size;
+		else
+			*(ASN1_BOOLEAN *)pval = -1;
 		return;
 
 		case V_ASN1_NULL:
diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index 11a90f739ed..6a76a96ba9c 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -307,7 +307,10 @@ int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 		return 1;
 
 		case V_ASN1_BOOLEAN:
-		*(ASN1_BOOLEAN *)pval = it->size;
+		if (it)
+			*(ASN1_BOOLEAN *)pval = it->size;
+		else
+			*(ASN1_BOOLEAN *)pval = -1;
 		return 1;
 
 		case V_ASN1_NULL: