1 files changed, 2 insertions, 1 deletions

diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c
index 87d7dfdf5c..3bee439968 100644
--- a/src/lib/libcrypto/asn1/tasn_dec.c
+++ b/src/lib/libcrypto/asn1/tasn_dec.c
@@ -168,7 +168,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
         int i;
         int otag;
         int ret = 0;
-        ASN1_VALUE **pchptr, *ptmpval;
+        ASN1_VALUE *pchval, **pchptr, *ptmpval;
         if (!pval)
                 return 0;
         if (aux && aux->asn1_cb)
@@ -319,6 +319,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
                         goto err;
                         }
                 /* CHOICE type, try each possibility in turn */
+                pchval = NULL;
                 p = *in;
                 for (i = 0, tt=it->templates; i < it->tcount; i++, tt++)
                         {