crypt32: Properly NULL-terminate decoded UTF8 strings.

65e8bf6f · Juan Lang · Alexandre Julliard · f290ec49 · 65e8bf6f
Commit 65e8bf6f authored Feb 24, 2009 by Juan Lang Committed by Alexandre Julliard Feb 25, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

decode.c dlls/crypt32/decode.c +2 -3

No files found.
--- a/dlls/crypt32/decode.c
+++ b/dlls/crypt32/decode.c
@@ -1724,9 +1724,8 @@ static BOOL CRYPT_AsnDecodeUnicodeNameValueInternal(const BYTE *pbEncoded,
                case ASN_UTF8STRING:
                    value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0,
                     (LPCSTR)pbEncoded + 1 + lenBytes, dataLen,
-                     str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2;
-                    value->Value.pbData[value->Value.cbData / sizeof(WCHAR)]
-                     = 0;
+                     str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * sizeof(WCHAR);
+                    *(WCHAR *)(value->Value.pbData + value->Value.cbData) = 0;
                    value->Value.cbData += sizeof(WCHAR);
                    break;
                }