crypt32: Validate input arguments to CryptQueryObject.

diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c
index 825dad587f1ceaa46d1abd238d09cea22b59ee16..f6e0c844e06ec031d865919f305fed53d3f1457a 100644 (file)
--- a/dlls/crypt32/object.c
+++ b/dlls/crypt32/object.c
@@ -492,6 +492,19 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject,
      dwExpectedFormatTypeFlags, dwFlags, pdwMsgAndCertEncodingType,
      pdwContentType, pdwFormatType, phCertStore, phMsg, ppvContext);
 
+    if (dwObjectType != CERT_QUERY_OBJECT_BLOB &&
+     dwObjectType != CERT_QUERY_OBJECT_FILE)
+    {
+        WARN("unsupported type %d\n", dwObjectType);
+        SetLastError(E_INVALIDARG);
+        return FALSE;
+    }
+    if (!pvObject)
+    {
+        WARN("missing required argument\n");
+        SetLastError(E_INVALIDARG);
+        return FALSE;
+    }
     if (dwExpectedContentTypeFlags & unimplementedTypes)
         WARN("unimplemented for types %08x\n",
          dwExpectedContentTypeFlags & unimplementedTypes);

diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c
index 6782cb00dc6ac551c3bf67de0a83822f6150fa18..23f35979583a4a9c8bb57adee9d11671b83ae5ff 100644 (file)
--- a/dlls/crypt32/tests/object.c
+++ b/dlls/crypt32/tests/object.c
@@ -130,13 +130,11 @@ static void test_query_object(void)
     SetLastError(0xdeadbeef);
     ret = CryptQueryObject(0, NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL,
      NULL);
-    todo_wine
     ok(!ret && GetLastError() == E_INVALIDARG,
      "expected E_INVALIDARG, got %08x\n", GetLastError());
     SetLastError(0xdeadbeef);
     ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, NULL, 0, 0, 0, NULL, NULL,
      NULL, NULL, NULL, NULL);
-    todo_wine
     ok(!ret && GetLastError() == E_INVALIDARG,
      "expected E_INVALIDARG, got %08x\n", GetLastError());
     /* Test with a simple cert */