From e94ce8a0b285af500e3cebd8d01199cfff315a9c Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang@gmail.com>
Date: Thu, 1 Nov 2007 09:31:43 -0700
Subject: [PATCH] crypt32: Fix leaked chains creating the root store.

---
 dlls/crypt32/rootstore.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c
index b96e456d30e..435cbc33683 100644
--- a/dlls/crypt32/rootstore.c
+++ b/dlls/crypt32/rootstore.c
@@ -232,21 +232,22 @@ static const char *get_cert_common_name(PCCERT_CONTEXT cert)
 
 static void check_and_store_certs(HCERTSTORE from, HCERTSTORE to)
 {
-    PCCERT_CONTEXT cert = NULL;
     DWORD root_count = 0;
+    CERT_CHAIN_ENGINE_CONFIG chainEngineConfig =
+     { sizeof(chainEngineConfig), 0 };
+    HCERTCHAINENGINE engine;
 
     TRACE("\n");
 
-    do {
-        cert = CertEnumCertificatesInStore(from, cert);
-        if (cert)
-        {
-            CERT_CHAIN_ENGINE_CONFIG chainEngineConfig =
-             { sizeof(chainEngineConfig), 0 };
-            HCERTCHAINENGINE engine = CRYPT_CreateChainEngine(to,
-             &chainEngineConfig);
+    CertDuplicateStore(to);
+    engine = CRYPT_CreateChainEngine(to, &chainEngineConfig);
+    if (engine)
+    {
+        PCCERT_CONTEXT cert = NULL;
 
-            if (engine)
+        do {
+            cert = CertEnumCertificatesInStore(from, cert);
+            if (cert)
             {
                 CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } };
                 PCCERT_CHAIN_CONTEXT chain;
@@ -275,11 +276,12 @@ static void check_and_store_certs(HCERTSTORE from, HCERTSTORE to)
                                  CERT_STORE_ADD_NEW, NULL))
                                     root_count++;
                     }
+                    CertFreeCertificateChain(chain);
                 }
-                CertFreeCertificateChainEngine(engine);
             }
-        }
-    } while (cert);
+        } while (cert);
+        CertFreeCertificateChainEngine(engine);
+    }
     TRACE("Added %d root certificates\n", root_count);
 }