From: Nils Larsch <nils@openssl.org>
Date: Wed, 8 Feb 2006 18:51:17 +0000 (+0000)
Subject: p could be uninitialized
X-Git-Tag: OpenSSL_0_9_8k^2~1572
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=82e8372f172e3893c43ef67d99ca114cefe8db3c;p=oweals%2Fopenssl.git

p could be uninitialized
---

diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index ffec26f2f3..4fcc8e86a6 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -158,7 +158,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
 	const ASN1_EXTERN_FUNCS *ef;
 	const ASN1_AUX *aux = it->funcs;
 	ASN1_aux_cb *asn1_cb;
-	const unsigned char *p, *q;
+	const unsigned char *p = NULL, *q;
 	unsigned char *wp=NULL;	/* BIG FAT WARNING!  BREAKS CONST WHERE USED */
 	unsigned char imphack = 0, oclass;
 	char seq_eoc, seq_nolen, cst, isopt;
@@ -283,6 +283,12 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
 			{
 			wp = *(unsigned char **)in;
 			imphack = *wp;
+			if (p == NULL)
+				{
+				ASN1err(ASN1_F_ASN1_ITEM_EX_D2I,
+					ERR_R_NESTED_ASN1_ERROR);
+				goto err;
+				}
 			*wp = (unsigned char)((*p & V_ASN1_CONSTRUCTED)
 								| it->utype);
 			}