crypt32: More parameter checking for opening signed encoded messages.

0b0df876 · Juan Lang · Alexandre Julliard · 19e63d90 · 0b0df876
Commit 0b0df876 authored Jul 23, 2007 by Juan Lang Committed by Alexandre Julliard Jul 24, 2007
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

msg.c dlls/crypt32/msg.c +11 -0

No files found.
--- a/dlls/crypt32/msg.c
+++ b/dlls/crypt32/msg.c
@@ -567,6 +567,17 @@ typedef struct _CMSG_SIGNED_ENCODE_INFO_WITH_CMS
 static BOOL CRYPT_IsValidSigner(CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer)
 {
+    if (signer->cbSize != sizeof(CMSG_SIGNER_ENCODE_INFO) &&
+     signer->cbSize != sizeof(CMSG_SIGNER_ENCODE_INFO_WITH_CMS))
+    {
+        SetLastError(E_INVALIDARG);
+        return FALSE;
+    }
+    if (signer->cbSize == sizeof(CMSG_SIGNER_ENCODE_INFO_WITH_CMS))
+    {
+        FIXME("CMSG_SIGNER_ENCODE_INFO with CMS fields unsupported\n");
+        return FALSE;
+    }
    if (!signer->pCertInfo->SerialNumber.cbData)
    {
        SetLastError(E_INVALIDARG);