wintrust: Only check the pgKnownSubject member if the struct includes it

[Juan Lang]

Fixes bug 17951.
--Juan
-------------- next part --------------
From c27714370a554b9247cdb9997ed8bb91b0fc73ba Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang at gmail.com>
Date: Thu, 11 Jun 2009 14:34:58 -0700
Subject: [PATCH] Only check the pgKnownSubject member if the struct includes it

---
 dlls/wintrust/softpub.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c
index 9a78838..e59c31f 100644
--- a/dlls/wintrust/softpub.c
+++ b/dlls/wintrust/softpub.c
@@ -90,7 +90,9 @@ static BOOL SOFTPUB_GetFileSubject(CRYPT_PROVIDER_DATA *data)
 {
     BOOL ret;
 
-    if (!data->pWintrustData->u.pFile->pgKnownSubject)
+    if (!WVT_ISINSTRUCT(WINTRUST_FILE_INFO,
+     data->pWintrustData->u.pFile->cbStruct, pgKnownSubject) ||
+     !data->pWintrustData->u.pFile->pgKnownSubject)
     {
         ret = CryptSIPRetrieveSubjectGuid(
          data->pWintrustData->u.pFile->pcwszFilePath,
-- 
1.6.3.2