You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.1 KiB
31 lines
1.1 KiB
diff -up openssl-1.0.1e/crypto/asn1/tasn_dec.c.combine-leak openssl-1.0.1e/crypto/asn1/tasn_dec.c |
|
--- openssl-1.0.1e/crypto/asn1/tasn_dec.c.combine-leak 2015-12-04 09:01:53.000000000 +0100 |
|
+++ openssl-1.0.1e/crypto/asn1/tasn_dec.c 2015-12-04 09:09:30.629793475 +0100 |
|
@@ -169,6 +169,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, |
|
int otag; |
|
int ret = 0; |
|
ASN1_VALUE **pchptr, *ptmpval; |
|
+ int combine = aclass & ASN1_TFLG_COMBINE; |
|
+ aclass &= ~ASN1_TFLG_COMBINE; |
|
if (!pval) |
|
return 0; |
|
if (aux && aux->asn1_cb) |
|
@@ -539,7 +541,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, |
|
auxerr: |
|
ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_AUX_ERROR); |
|
err: |
|
- ASN1_item_ex_free(pval, it); |
|
+ if (combine == 0) |
|
+ ASN1_item_ex_free(pval, it); |
|
if (errtt) |
|
ERR_add_error_data(4, "Field=", errtt->field_name, |
|
", Type=", it->sname); |
|
@@ -767,7 +770,7 @@ static int asn1_template_noexp_d2i(ASN1_ |
|
{ |
|
/* Nothing special */ |
|
ret = ASN1_item_ex_d2i(val, &p, len, ASN1_ITEM_ptr(tt->item), |
|
- -1, 0, opt, ctx); |
|
+ -1, tt->flags & ASN1_TFLG_COMBINE, opt, ctx); |
|
if (!ret) |
|
{ |
|
ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I,
|
|
|