wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 4853f65c844de8277b8b0420df1a2cdb1c5b17c8.

Browse Source 
mfplat-streaming-support disabled once again.
This commit is contained in:
Alistair Leslie-Hughes
2022-02-23 14:27:11 +11:00
parent bcfed21ea1
commit 05ea40b936
11 changed files with 182 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/wintrust-WTHelperGetProvCertFromChain/0001-wintrust-Add-parameter-check-in-WTHelperGetProvCertF.patch
View File

@@ -1,4 +1,4 @@
From 563f0ccc4f47914e1e2952cc4bc5673cbb97a5ae Mon Sep 17 00:00:00 2001
From 7f8f6898788adbb31318aaead591b129138288c2 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 18 Apr 2018 03:55:16 +0000
Subject: [PATCH] wintrust: Add parameter check in WTHelperGetProvCertFromChain
@@ -10,10 +10,10 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c
index 1f87234..8b02e77 100644
index 25d458faad7..998cce85380 100644
--- a/dlls/wintrust/tests/softpub.c
+++ b/dlls/wintrust/tests/softpub.c
@@ -1300,6 +1300,14 @@ static void test_get_known_usages(void)
@@ -1312,6 +1312,14 @@ static void test_get_known_usages(void)
"expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
}
@@ -28,19 +28,19 @@ index 1f87234..8b02e77 100644
START_TEST(softpub)
{
InitFunctionPtrs();
@@ -1308,4 +1316,5 @@ START_TEST(softpub)
@@ -1320,4 +1328,5 @@ START_TEST(softpub)
test_wintrust();
test_wintrust_digest();
test_get_known_usages();
+ test_WTHelperGetProvCertFromChain();
}
diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c
index 58e3ac3..bb52282 100644
index 33695008b24..60c633e5abf 100644
--- a/dlls/wintrust/wintrust_main.c
+++ b/dlls/wintrust/wintrust_main.c
@@ -787,7 +787,7 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain(
@@ -782,7 +782,7 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain(
TRACE("(%p %d)\n", pSgnr, idxCert);
TRACE("(%p %ld)\n", pSgnr, idxCert);
- if (idxCert >= pSgnr->csCertChain || !pSgnr->pasCertChain)
+ if (!pSgnr || idxCert >= pSgnr->csCertChain || !pSgnr->pasCertChain)
@@ -48,5 +48,5 @@ index 58e3ac3..bb52282 100644
cert = &pSgnr->pasCertChain[idxCert];
TRACE("returning %p\n", cert);
--
1.9.1
2.34.1