From: Paul Gofman <pgofman@codeweavers.com> --- dlls/wintrust/tests/crypt.c | 17 +++++++++++++++++ dlls/wintrust/wintrust_main.c | 3 +++ 2 files changed, 20 insertions(+) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 84675dae8b7..fd9b4e450fb 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -25,6 +25,7 @@ #include "windows.h" #include "wincrypt.h" #include "mscat.h" +#include "wintrust.h" #include "wine/test.h" @@ -1448,6 +1449,21 @@ static void test_sip(void) DeleteFileW(nameW); } +static void test_WTHelperGetProvCertFromChain(void) +{ + CRYPT_PROVIDER_CERT *cert; + + SetLastError(0xdeadbeef); + cert = WTHelperGetProvCertFromChain(NULL, 0); + ok(!cert, "got %p.\n", cert); + ok(GetLastError() == 0xdeadbeef, "got %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + cert = WTHelperGetProvCertFromChain(NULL, 1); + ok(!cert, "got %p.\n", cert); + ok(GetLastError() == 0xdeadbeef, "got %lu.\n", GetLastError()); +} + START_TEST(crypt) { char** myARGV; @@ -1483,4 +1499,5 @@ START_TEST(crypt) test_create_catalog_file(); test_CryptCATAdminAddRemoveCatalog(); test_sip(); + test_WTHelperGetProvCertFromChain(); } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 22921006d4a..bfaa79c7654 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -759,6 +759,9 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain( TRACE("(%p %ld)\n", pSgnr, idxCert); + if (!pSgnr) + return NULL; + if (idxCert >= pSgnr->csCertChain || !pSgnr->pasCertChain) return NULL; cert = &pSgnr->pasCertChain[idxCert]; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11545