Dmitry Timoshkov : crypt32: If there is no optional parameters set rgProvParam to NULL in CRYPT_KEY_PROV_INFO.

Alexandre Julliard julliard at winehq.org
Fri Dec 7 12:13:14 CST 2018


Module: wine
Branch: master
Commit: ea77ba04f398fdd943d583180d0cb0496b9f8ee9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ea77ba04f398fdd943d583180d0cb0496b9f8ee9

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Fri Dec  7 16:01:11 2018 +0300

crypt32: If there is no optional parameters set rgProvParam to NULL in CRYPT_KEY_PROV_INFO.

Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/crypt32/cert.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c
index e591c4d..2d4ce8c 100644
--- a/dlls/crypt32/cert.c
+++ b/dlls/crypt32/cert.c
@@ -533,14 +533,19 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info)
     provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR);
     data += provNameLen;
 
-    info->rgProvParam = (PCRYPT_KEY_PROV_PARAM)data;
-    data += info->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM);
-
-    for (i = 0; i < info->cProvParam; i++)
+    if (info->cProvParam)
     {
-        info->rgProvParam[i].pbData = data;
-        data += info->rgProvParam[i].cbData;
+        info->rgProvParam = (PCRYPT_KEY_PROV_PARAM)data;
+        data += info->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM);
+
+        for (i = 0; i < info->cProvParam; i++)
+        {
+            info->rgProvParam[i].pbData = data;
+            data += info->rgProvParam[i].cbData;
+        }
     }
+    else
+        info->rgProvParam = NULL;
 }
 
 BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext,




More information about the wine-cvs mailing list