2 files changed, 10 insertions, 0 deletions

diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c
index f19c457169..1ce40039b1 100644
--- a/src/lib/libcrypto/asn1/tasn_dec.c
+++ b/src/lib/libcrypto/asn1/tasn_dec.c
@@ -171,6 +171,11 @@ ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
 
         if (!pval)
                 return 0;
+        /* always start fresh */
+        if (*pval) {
+                ASN1_item_ex_free(pval, it);
+                *pval = NULL;
+        }
         if (aux && aux->asn1_cb)
                 asn1_cb = aux->asn1_cb;
         else
diff --git a/src/lib/libssl/src/crypto/asn1/tasn_dec.c b/src/lib/libssl/src/crypto/asn1/tasn_dec.c
index f19c457169..1ce40039b1 100644
--- a/src/lib/libssl/src/crypto/asn1/tasn_dec.c
+++ b/src/lib/libssl/src/crypto/asn1/tasn_dec.c
@@ -171,6 +171,11 @@ ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
 
         if (!pval)
                 return 0;
+        /* always start fresh */
+        if (*pval) {
+                ASN1_item_ex_free(pval, it);
+                *pval = NULL;
+        }
         if (aux && aux->asn1_cb)
                 asn1_cb = aux->asn1_cb;
         else