Dmitry Timoshkov : crypt32: pwszContainerName or pwszProvName could be NULL in CRYPT_KEY_PROV_INFO.

[Alexandre Julliard]

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

Author: Dmitry Timoshkov <dmitry(a)baikal.ru>
Date:   Thu May 21 13:02:41 2020 +0800

crypt32: pwszContainerName or pwszProvName could be NULL in CRYPT_KEY_PROV_INFO.

Make behaviour of CRYPT_FixKeyProvInfoPointers match
CRYPT_CopyKeyProvInfo, and fix reading CRYPT_KEY_PROV_INFO certificate
property from the store.

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

---

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

diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c
index 48eaac082e..488b84001c 100644
--- a/dlls/crypt32/cert.c
+++ b/dlls/crypt32/cert.c
@@ -525,13 +525,19 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info)
     DWORD i, containerLen, provNameLen;
     LPBYTE data = (LPBYTE)info + sizeof(CRYPT_KEY_PROV_INFO);
 
-    info->pwszContainerName = (LPWSTR)data;
-    containerLen = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR);
-    data += containerLen;
+    if (info->pwszContainerName)
+    {
+        info->pwszContainerName = (LPWSTR)data;
+        containerLen = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR);
+        data += containerLen;
+    }
 
-    info->pwszProvName = (LPWSTR)data;
-    provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR);
-    data += provNameLen;
+    if (info->pwszProvName)
+    {
+        info->pwszProvName = (LPWSTR)data;
+        provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR);
+        data += provNameLen;
+    }
 
     if (info->cProvParam)
     {