Module: wine Branch: master Commit: 155aa41d7cae11e10f999fa9bff8c469edbfc1e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=155aa41d7cae11e10f999fa9bf...
Author: Juan Lang juan.lang@gmail.com Date: Wed Oct 14 13:05:44 2009 -0700
crypt32: Decode cert policies info using CRYPT_AsnDecodeArrayNoAlloc.
---
dlls/crypt32/decode.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 19ad2ec..4c21549 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3895,9 +3895,29 @@ static BOOL WINAPI CRYPT_AsnDecodeCertPolicies(DWORD dwCertEncodingType, sizeof(CERT_POLICIES_INFO), CRYPT_AsnDecodeCertPolicy, sizeof(CERT_POLICY_INFO), TRUE, offsetof(CERT_POLICY_INFO, pszPolicyIdentifier) }; + DWORD bytesNeeded;
- ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL); + if (ret) + { + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) + { + CERT_POLICIES_INFO *info; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + info = pvStructInfo; + info->rgPolicyInfo = (PCERT_POLICY_INFO) + ((BYTE *)pvStructInfo + sizeof(CERT_POLICIES_INFO)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, + pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + &info->cPolicyInfo, pcbStructInfo, NULL); + } + } } __EXCEPT_PAGE_FAULT {