diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index 098e86819935d8911b84ed956aeb099112649046..b0a4afae838dd2db455cc75cac1753bebf805abd 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -352,7 +352,10 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
 			CRYPTO_r_unlock(CRYPTO_LOCK_X509_STORE);
 			}
 		else
+			{
 			k = 0;
+			hent = NULL;
+			}
 		for (;;)
 			{
 			char c = '/';
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index ead1e0b811c7f5475304ab9671d6e58f6c9f7640..e29c35c861f1050f86f5688f96e36f066667f8dd 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -196,6 +196,8 @@ X509_STORE *X509_STORE_new(void)
 	ret->get_crl = 0;
 	ret->check_crl = 0;
 	ret->cert_crl = 0;
+	ret->lookup_certs = 0;
+	ret->lookup_crls = 0;
 	ret->cleanup = 0;
 
 	CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509_STORE, ret, &ret->ex_data);