|
 |
a2b5a9 |
diff -up openssl-1.0.1e/crypto/asn1/tasn_dec.c.combine-leak openssl-1.0.1e/crypto/asn1/tasn_dec.c
|
|
|
a2b5a9 |
--- openssl-1.0.1e/crypto/asn1/tasn_dec.c.combine-leak 2015-12-04 09:01:53.000000000 +0100
|
|
|
a2b5a9 |
+++ openssl-1.0.1e/crypto/asn1/tasn_dec.c 2015-12-04 09:09:30.629793475 +0100
|
|
|
a2b5a9 |
@@ -169,6 +169,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval,
|
|
|
a2b5a9 |
int otag;
|
|
|
a2b5a9 |
int ret = 0;
|
|
|
a2b5a9 |
ASN1_VALUE **pchptr, *ptmpval;
|
|
|
a2b5a9 |
+ int combine = aclass & ASN1_TFLG_COMBINE;
|
|
|
a2b5a9 |
+ aclass &= ~ASN1_TFLG_COMBINE;
|
|
|
a2b5a9 |
if (!pval)
|
|
|
a2b5a9 |
return 0;
|
|
|
a2b5a9 |
if (aux && aux->asn1_cb)
|
|
|
a2b5a9 |
@@ -539,7 +541,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval,
|
|
|
a2b5a9 |
auxerr:
|
|
|
a2b5a9 |
ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_AUX_ERROR);
|
|
|
a2b5a9 |
err:
|
|
|
a2b5a9 |
- ASN1_item_ex_free(pval, it);
|
|
|
a2b5a9 |
+ if (combine == 0)
|
|
|
a2b5a9 |
+ ASN1_item_ex_free(pval, it);
|
|
|
a2b5a9 |
if (errtt)
|
|
|
a2b5a9 |
ERR_add_error_data(4, "Field=", errtt->field_name,
|
|
|
a2b5a9 |
", Type=", it->sname);
|
|
|
a2b5a9 |
@@ -767,7 +770,7 @@ static int asn1_template_noexp_d2i(ASN1_
|
|
|
a2b5a9 |
{
|
|
|
a2b5a9 |
/* Nothing special */
|
|
|
a2b5a9 |
ret = ASN1_item_ex_d2i(val, &p, len, ASN1_ITEM_ptr(tt->item),
|
|
|
a2b5a9 |
- -1, 0, opt, ctx);
|
|
|
a2b5a9 |
+ -1, tt->flags & ASN1_TFLG_COMBINE, opt, ctx);
|
|
|
a2b5a9 |
if (!ret)
|
|
|
a2b5a9 |
{
|
|
|
a2b5a9 |
ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I,
|