wintrust: Check that provider functions are not NULL before using them.

91d5844f · Rob Shearman · Alexandre Julliard · 8e0f125f · 91d5844f
Commit 91d5844f authored Apr 23, 2008 by Rob Shearman Committed by Alexandre Julliard Apr 24, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 26 additions and 13 deletions

wintrust_main.c dlls/wintrust/wintrust_main.c +26 -13

No files found.
--- a/dlls/wintrust/wintrust_main.c
+++ b/dlls/wintrust/wintrust_main.c
@@ -111,19 +111,32 @@ static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID,
    provData->pgActionID = actionID;
    WintrustGetRegPolicyFlags(&provData->dwRegPolicySettings);
-    err = provData->psPfns->pfnInitialize(provData);
+    if (provData->psPfns->pfnInitialize)
-    if (err)
+    {
-        goto done;
+        err = provData->psPfns->pfnInitialize(provData);
-    err = provData->psPfns->pfnObjectTrust(provData);
+        if (err)
-    if (err)
+            goto done;
-        goto done;
+    }
-    err = provData->psPfns->pfnSignatureTrust(provData);
+    if (provData->psPfns->pfnObjectTrust)
-    if (err)
+    {
-        goto done;
+        err = provData->psPfns->pfnObjectTrust(provData);
-    err = provData->psPfns->pfnCertificateTrust(provData);
+        if (err)
-    if (err)
+            goto done;
-        goto done;
+    }
-    err = provData->psPfns->pfnFinalPolicy(provData);
+    if (provData->psPfns->pfnSignatureTrust)
+    {
+        err = provData->psPfns->pfnSignatureTrust(provData);
+        if (err)
+            goto done;
+    }
+    if (provData->psPfns->pfnCertificateTrust)
+    {
+        err = provData->psPfns->pfnCertificateTrust(provData);
+        if (err)
+            goto done;
+    }
+    if (provData->psPfns->pfnFinalPolicy)
+        err = provData->psPfns->pfnFinalPolicy(provData);
    goto done;
 oom: