From dd26bee14c92c60f92177867bf77138907d7fac1 Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang@gmail.com>
Date: Tue, 20 Oct 2009 09:54:56 -0700
Subject: [PATCH] crypt32: Fix duplicating a NULL CTL context.

---
 dlls/crypt32/ctl.c       |  3 ++-
 dlls/crypt32/tests/ctl.c | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c
index 5a6d19b64f..1bd60e7e75 100644
--- a/dlls/crypt32/ctl.c
+++ b/dlls/crypt32/ctl.c
@@ -455,7 +455,8 @@ end:
 PCCTL_CONTEXT WINAPI CertDuplicateCTLContext(PCCTL_CONTEXT pCtlContext)
 {
     TRACE("(%p)\n", pCtlContext);
-    Context_AddRef((void *)pCtlContext, sizeof(CTL_CONTEXT));
+    if (pCtlContext)
+        Context_AddRef((void *)pCtlContext, sizeof(CTL_CONTEXT));
     return pCtlContext;
 }
 
diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c
index f09420c8a2..8ee2652628 100644
--- a/dlls/crypt32/tests/ctl.c
+++ b/dlls/crypt32/tests/ctl.c
@@ -187,6 +187,21 @@ static void testCreateCTL(void)
         CertFreeCTLContext(ctl);
 }
 
+static void testDupCTL(void)
+{
+    PCCTL_CONTEXT context, dupContext;
+
+    context = CertDuplicateCTLContext(NULL);
+    ok(context == NULL, "expected NULL\n");
+    context = CertCreateCTLContext(X509_ASN_ENCODING,
+     signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent));
+    dupContext = CertDuplicateCTLContext(context);
+    ok(dupContext != NULL, "expected a context\n");
+    ok(dupContext == context, "expected identical context addresses\n");
+    CertFreeCTLContext(dupContext);
+    CertFreeCTLContext(context);
+}
+
 static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID,
  PCCTL_CONTEXT context, DWORD propID)
 {
@@ -444,6 +459,7 @@ static void testAddCTLToStore(void)
 START_TEST(ctl)
 {
     testCreateCTL();
+    testDupCTL();
     testCTLProperties();
     testAddCTLToStore();
 }
-- 
2.32.0.93.g670b81a890