X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fasn1%2Ftasn_fre.c;h=b68b66a23b18d112da8890cf00aac5279bd7f85e;hb=feef17fd8828d37b80c6fdbdb2614937a93654e4;hp=910f9b4f262f88554bd13187731aa9583b6f425d;hpb=230fd6b7b66f0b72b1cf7fc300652a1adf94ba1a;p=oweals%2Fopenssl.git

diff --git a/crypto/asn1/tasn_fre.c b/crypto/asn1/tasn_fre.c
index 910f9b4f26..b68b66a23b 100644
--- a/crypto/asn1/tasn_fre.c
+++ b/crypto/asn1/tasn_fre.c
@@ -67,33 +67,40 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int c
 /* Free up an ASN1 structure */
 
 void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it)
-{
+	{
 	asn1_item_combine_free(&val, it, 0);
-}
+	}
 
 void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
-{
+	{
 	asn1_item_combine_free(pval, it, 0);
-}
+	}
 
 static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine)
-{
+	{
 	const ASN1_TEMPLATE *tt = NULL, *seqtt;
 	const ASN1_EXTERN_FUNCS *ef;
 	const ASN1_COMPAT_FUNCS *cf;
 	const ASN1_AUX *aux = it->funcs;
 	ASN1_aux_cb *asn1_cb;
 	int i;
-	if(!pval) return;
-	if((it->itype != ASN1_ITYPE_PRIMITIVE) && !*pval) return;
-	if(aux && aux->asn1_cb) asn1_cb = aux->asn1_cb;
-	else asn1_cb = 0;
+	if (!pval)
+		return;
+	if ((it->itype != ASN1_ITYPE_PRIMITIVE) && !*pval)
+		return;
+	if (aux && aux->asn1_cb)
+		asn1_cb = aux->asn1_cb;
+	else
+		asn1_cb = 0;
 
-	switch(it->itype) {
+	switch(it->itype)
+		{
 
 		case ASN1_ITYPE_PRIMITIVE:
-		if(it->templates) ASN1_template_free(pval, it->templates);
-		else ASN1_primitive_free(pval, it);
+		if (it->templates)
+			ASN1_template_free(pval, it->templates);
+		else
+			ASN1_primitive_free(pval, it);
 		break;
 
 		case ASN1_ITYPE_MSTRING:
@@ -101,42 +108,53 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int c
 		break;
 
 		case ASN1_ITYPE_CHOICE:
-		if(asn1_cb) {
+		if (asn1_cb)
+			{
 			i = asn1_cb(ASN1_OP_FREE_PRE, pval, it);
-			if(i == 2) return;
-		}
+			if (i == 2)
+				return;
+			}
 		i = asn1_get_choice_selector(pval, it);
-		if(asn1_cb) asn1_cb(ASN1_OP_FREE_PRE, pval, it);
-		if((i >= 0) && (i < it->tcount)) {
+		if (asn1_cb)
+			asn1_cb(ASN1_OP_FREE_PRE, pval, it);
+		if ((i >= 0) && (i < it->tcount))
+			{
 			ASN1_VALUE **pchval;
 			tt = it->templates + i;
 			pchval = asn1_get_field_ptr(pval, tt);
 			ASN1_template_free(pchval, tt);
-		}
-		if(asn1_cb) asn1_cb(ASN1_OP_FREE_POST, pval, it);
-		if(!combine) {
+			}
+		if (asn1_cb)
+			asn1_cb(ASN1_OP_FREE_POST, pval, it);
+		if (!combine)
+			{
 			OPENSSL_free(*pval);
 			*pval = NULL;
-		}
+			}
 		break;
 
 		case ASN1_ITYPE_COMPAT:
 		cf = it->funcs;
-		if(cf && cf->asn1_free) cf->asn1_free(*pval);
+		if (cf && cf->asn1_free)
+			cf->asn1_free(*pval);
 		break;
 
 		case ASN1_ITYPE_EXTERN:
 		ef = it->funcs;
-		if(ef && ef->asn1_ex_free) ef->asn1_ex_free(pval, it);
+		if (ef && ef->asn1_ex_free)
+			ef->asn1_ex_free(pval, it);
 		break;
 
 		case ASN1_ITYPE_NDEF_SEQUENCE:
 		case ASN1_ITYPE_SEQUENCE:
-		if(asn1_do_lock(pval, -1, it) > 0) return;
-		if(asn1_cb) {
+		if (asn1_do_lock(pval, -1, it) > 0)
+			return;
+		if (asn1_cb)
+			{
 			i = asn1_cb(ASN1_OP_FREE_PRE, pval, it);
-			if(i == 2) return;
-		}		
+			if (i == 2)
+				return;
+			}		
 		asn1_enc_free(pval, it);
 		/* If we free up as normal we will invalidate any
 		 * ANY DEFINED BY field and we wont be able to 
@@ -144,70 +162,93 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int c
 		 * free up in reverse order.
 		 */
 		tt = it->templates + it->tcount - 1;
-		for(i = 0; i < it->tcount; tt--, i++) {
+		for (i = 0; i < it->tcount; tt--, i++)
+			{
 			ASN1_VALUE **pseqval;
 			seqtt = asn1_do_adb(pval, tt, 0);
-			if(!seqtt) continue;
+			if (!seqtt)
+				continue;
 			pseqval = asn1_get_field_ptr(pval, seqtt);
 			ASN1_template_free(pseqval, seqtt);
-		}
-		if(asn1_cb) asn1_cb(ASN1_OP_FREE_POST, pval, it);
-		if(!combine) {
+			}
+		if (asn1_cb)
+			asn1_cb(ASN1_OP_FREE_POST, pval, it);
+		if (!combine)
+			{
 			OPENSSL_free(*pval);
 			*pval = NULL;
-		}
+			}
 		break;
+		}
 	}
-}
 
 void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
-{
+	{
 	int i;
-	if(tt->flags & ASN1_TFLG_SK_MASK) {
+	if (tt->flags & ASN1_TFLG_SK_MASK)
+		{
 		STACK_OF(ASN1_VALUE) *sk = (STACK_OF(ASN1_VALUE) *)*pval;
-		for(i = 0; i < sk_ASN1_VALUE_num(sk); i++) {
+		for (i = 0; i < sk_ASN1_VALUE_num(sk); i++)
+			{
 			ASN1_VALUE *vtmp;
 			vtmp = sk_ASN1_VALUE_value(sk, i);
-			asn1_item_combine_free(&vtmp, ASN1_ITEM_ptr(tt->item), 0);
-		}
+			asn1_item_combine_free(&vtmp, ASN1_ITEM_ptr(tt->item),
+									0);
+			}
 		sk_ASN1_VALUE_free(sk);
 		*pval = NULL;
-	} else asn1_item_combine_free(pval, ASN1_ITEM_ptr(tt->item),
+		}
+	else
+		asn1_item_combine_free(pval, ASN1_ITEM_ptr(tt->item),
 						tt->flags & ASN1_TFLG_COMBINE);
-}
+	}
 
 void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
-{
+	{
 	int utype;
-	if(it) {
+	if (it)
+		{
 		const ASN1_PRIMITIVE_FUNCS *pf;
 		pf = it->funcs;
-		if(pf && pf->prim_free) {
+		if (pf && pf->prim_free)
+			{
 			pf->prim_free(pval, it);
 			return;
+			}
 		}
-	}
 	/* Special case: if 'it' is NULL free contents of ASN1_TYPE */
-	if(!it) {
+	if (!it)
+		{
 		ASN1_TYPE *typ = (ASN1_TYPE *)*pval;
 		utype = typ->type;
 		pval = (ASN1_VALUE **)&typ->value.ptr;
-		if(!*pval) return;
-	} else if(it->itype == ASN1_ITYPE_MSTRING) {
+		if (!*pval)
+			return;
+		}
+	else if (it->itype == ASN1_ITYPE_MSTRING)
+		{
 		utype = -1;
-		if(!*pval) return;
-	} else {
+		if (!*pval)
+			return;
+		}
+	else
+		{
 		utype = it->utype;
-		if((utype != V_ASN1_BOOLEAN) && !*pval) return;
-	}
+		if ((utype != V_ASN1_BOOLEAN) && !*pval)
+			return;
+		}
 
-	switch(utype) {
+	switch(utype)
+		{
 		case V_ASN1_OBJECT:
 		ASN1_OBJECT_free((ASN1_OBJECT *)*pval);
 		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:
@@ -222,6 +263,6 @@ void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 		ASN1_STRING_free((ASN1_STRING *)*pval);
 		*pval = NULL;
 		break;
-	}
+		}
 	*pval = NULL;
-}
+	}