wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Huw Davies : oleaut32: Fix a couple of memory leaks in the tests.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 6f4ad21b9d3e2b231859660fca3252013d480935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4ad21b9d3e2b231859660fc… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Dec 6 12:05:37 2009 +0000 oleaut32: Fix a couple of memory leaks in the tests. Found by Valgrind. --- dlls/oleaut32/tests/safearray.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index d539056..439325d 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1658,9 +1658,11 @@ static void test_SafeArrayChangeTypeEx(void) MKARRAY(0,1,VT_UI1); hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_NULL); ok(hres == DISP_E_TYPEMISMATCH, "CTE VT_ARRAY|VT_UI1 returned %x\n", hres); + VariantClear(&v); MKARRAY(0,1,VT_UI1); hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_EMPTY); ok(hres == DISP_E_TYPEMISMATCH, "CTE VT_ARRAY|VT_UI1 returned %x\n", hres); + VariantClear(&v); }

1 0

Huw Davies : inetcomm: Fix memory leak.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: bf93519a395172c967c78467e2bf2437d35b59d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf93519a395172c967c78467e… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Dec 6 11:38:32 2009 +0000 inetcomm: Fix memory leak. Found by Valgrind. --- dlls/inetcomm/mimeole.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 871ffa5..992949a 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1610,6 +1610,7 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc } while(1); end: + HeapFree(GetProcessHeap(), 0, nl_boundary); HeapFree(GetProcessHeap(), 0, buf); return hr; }

1 0

Huw Davies : gdiplus: Fix a couple of memory leaks.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 55bf97bba7e8eaff93e736342a268cf6fbbf86fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=55bf97bba7e8eaff93e736342… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Dec 6 11:11:44 2009 +0000 gdiplus: Fix a couple of memory leaks. Found by Valgrind. --- dlls/gdiplus/region.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 197b68a..eab9b8f 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -249,6 +249,7 @@ GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *region, GpPath *path, Combin if(mode == CombineModeReplace){ delete_element(&region->node); memcpy(region, path_region, sizeof(GpRegion)); + GdipFree(path_region); return Ok; } @@ -295,6 +296,7 @@ GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, if(mode == CombineModeReplace){ delete_element(&region->node); memcpy(region, rect_region, sizeof(GpRegion)); + GdipFree(rect_region); return Ok; }

1 0

Juan Lang : wintrust: Fail to load a certificate from a PE file if the certificate entry isn' t a known type.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 497b67dbf623e8aacb2eaaaa326a5782eb3c06d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=497b67dbf623e8aacb2eaaaa3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 5 19:17:25 2009 -0800 wintrust: Fail to load a certificate from a PE file if the certificate entry isn't a known type. --- dlls/wintrust/crypt.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index d9fa563..c41a56b 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -1028,7 +1028,18 @@ static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo, /* app hasn't passed buffer, just get the length */ ret = ImageGetCertificateHeader(pSubjectInfo->hFile, dwIndex, &cert); if (ret) - *pcbSignedDataMsg = cert.dwLength; + { + switch (cert.wCertificateType) + { + case WIN_CERT_TYPE_X509: + case WIN_CERT_TYPE_PKCS_SIGNED_DATA: + *pcbSignedDataMsg = cert.dwLength; + break; + default: + WARN("unknown certificate type %d\n", cert.wCertificateType); + ret = FALSE; + } + } } else { @@ -1065,9 +1076,10 @@ static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo, *pdwEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; break; default: - FIXME("don't know what to do for encoding type %d\n", + WARN("don't know what to do for encoding type %d\n", pCert->wCertificateType); *pdwEncodingType = 0; + ret = FALSE; } } }

1 0

Juan Lang : rsaenh/tests: Fix memory leaks.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: d69b00d630200ce013a3a8a97eea987e1165e89a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69b00d630200ce013a3a8a97… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 5 16:28:21 2009 -0800 rsaenh/tests: Fix memory leaks. --- dlls/rsaenh/tests/rsaenh.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index b56f4d4..2c7ca0e 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2093,6 +2093,7 @@ static void test_rsa_round_trip(void) ok(dataLen == sizeof(test_string), "unexpected size %d\n", dataLen); ok(!memcmp(data, test_string, sizeof(test_string)), "unexpected value\n"); } + CryptDestroyKey(keyExchangeKey); CryptReleaseContext(prov, 0); CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, @@ -2334,6 +2335,7 @@ static void test_null_provider(void) ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); result = CryptGenKey(prov, CALG_RSA_SIGN, 0, &key); ok(result, "CryptGenKey with CALG_RSA_SIGN failed with error %08x\n", GetLastError()); + CryptDestroyKey(key); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result, "expected CryptGetUserKey to fail\n"); result = CryptGetUserKey(prov, AT_SIGNATURE, &key); @@ -2350,6 +2352,7 @@ static void test_null_provider(void) ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); result = CryptGenKey(prov, CALG_RSA_KEYX, 0, &key); ok(result, "CryptGenKey with CALG_RSA_KEYX failed with error %08x\n", GetLastError()); + CryptDestroyKey(key); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(result, "CryptGetUserKey with AT_KEYEXCHANGE failed: %08x\n", GetLastError()); result = CryptGetUserKey(prov, AT_SIGNATURE, &key);

1 0

Juan Lang : crypt32/tests: Fix memory leak in test.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: bab1c652ae87b2c1a1c59dbe0cc549e0d6a7bb60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab1c652ae87b2c1a1c59dbe0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 5 16:21:21 2009 -0800 crypt32/tests: Fix memory leak in test. --- dlls/crypt32/tests/protectdata.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index 91bad8e..afe74ca 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -237,6 +237,8 @@ static void test_simpleroundtrip(const char *plaintext) ok(res != 0, "can't unprotect; last error %u\n", GetLastError()); ok(output.cbData == strlen(plaintext), "output wrong length %d for input '%s', wanted %d\n", output.cbData, plaintext, strlen(plaintext)); ok(!memcmp(plaintext, (char *)output.pbData, output.cbData), "output wrong contents for input '%s'\n", plaintext); + LocalFree(output.pbData); + LocalFree(encrypted.pbData); } START_TEST(protectdata)

1 0

Juan Lang : rsaenh: Fix memory leak in CPSignHash.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 035c323054c23c83203b7ac9b8d9bc7a050336ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=035c323054c23c83203b7ac9b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 5 16:05:26 2009 -0800 rsaenh: Fix memory leak in CPSignHash. --- dlls/rsaenh/rsaenh.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 8234688..0228696 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -4162,11 +4162,12 @@ BOOL WINAPI RSAENH_CPSignHash(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpe LPCWSTR sDescription, DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen) { - HCRYPTKEY hCryptKey; + HCRYPTKEY hCryptKey = (HCRYPTKEY)INVALID_HANDLE_VALUE; CRYPTKEY *pCryptKey; DWORD dwHashLen; BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; ALG_ID aiAlgid; + BOOL ret = FALSE; TRACE("(hProv=%08lx, hHash=%08lx, dwKeySpec=%08x, sDescription=%s, dwFlags=%08x, " "pbSignature=%p, pdwSigLen=%p)\n", hProv, hHash, dwKeySpec, debugstr_w(sDescription), @@ -4183,18 +4184,19 @@ BOOL WINAPI RSAENH_CPSignHash(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpe (OBJECTHDR**)&pCryptKey)) { SetLastError(NTE_NO_KEY); - return FALSE; + goto out; } if (!pbSignature) { *pdwSigLen = pCryptKey->dwKeyLen; - return TRUE; + ret = TRUE; + goto out; } if (pCryptKey->dwKeyLen > *pdwSigLen) { SetLastError(ERROR_MORE_DATA); *pdwSigLen = pCryptKey->dwKeyLen; - return FALSE; + goto out; } *pdwSigLen = pCryptKey->dwKeyLen; @@ -4202,22 +4204,25 @@ BOOL WINAPI RSAENH_CPSignHash(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpe if (!RSAENH_CPHashData(hProv, hHash, (CONST BYTE*)sDescription, (DWORD)lstrlenW(sDescription)*sizeof(WCHAR), 0)) { - return FALSE; + goto out; } } dwHashLen = sizeof(DWORD); - if (!RSAENH_CPGetHashParam(hProv, hHash, HP_ALGID, (BYTE*)&aiAlgid, &dwHashLen, 0)) return FALSE; + if (!RSAENH_CPGetHashParam(hProv, hHash, HP_ALGID, (BYTE*)&aiAlgid, &dwHashLen, 0)) goto out; dwHashLen = RSAENH_MAX_HASH_SIZE; - if (!RSAENH_CPGetHashParam(hProv, hHash, HP_HASHVAL, abHashValue, &dwHashLen, 0)) return FALSE; + if (!RSAENH_CPGetHashParam(hProv, hHash, HP_HASHVAL, abHashValue, &dwHashLen, 0)) goto out; if (!build_hash_signature(pbSignature, *pdwSigLen, aiAlgid, abHashValue, dwHashLen, dwFlags)) { - return FALSE; + goto out; } - return encrypt_block_impl(pCryptKey->aiAlgid, PK_PRIVATE, &pCryptKey->context, pbSignature, pbSignature, RSAENH_ENCRYPT); + ret = encrypt_block_impl(pCryptKey->aiAlgid, PK_PRIVATE, &pCryptKey->context, pbSignature, pbSignature, RSAENH_ENCRYPT); +out: + RSAENH_CPDestroyKey(hProv, hCryptKey); + return ret; } /******************************************************************************

1 0

Juan Lang : crypt32/tests: Don' t pass as a parameter a variable that could be local.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: cdbf6e86145233186bd1243587874fbbb4edc65f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdbf6e86145233186bd124358… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 5 15:42:06 2009 -0800 crypt32/tests: Don't pass as a parameter a variable that could be local. --- dlls/crypt32/tests/cert.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 0566797..d3b362c 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1639,16 +1639,16 @@ static void verifySig(HCRYPTPROV csp, const BYTE *toSign, size_t toSignLen, /* Tests signing the certificate described by toBeSigned with the CSP passed in, * using the algorithm with OID sigOID. The CSP is assumed to be empty, and a - * keyset named AT_SIGNATURE will be added to it. The signing key will be - * stored in *key, and the signature will be stored in sig. sigLen should be - * at least 64 bytes. + * keyset named AT_SIGNATURE will be added to it. The signature will be stored + * in sig. sigLen should be at least 64 bytes. */ static void testSignCert(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, - LPCSTR sigOID, HCRYPTKEY *key, BYTE *sig, DWORD *sigLen) + LPCSTR sigOID, BYTE *sig, DWORD *sigLen) { BOOL ret; DWORD size = 0; CRYPT_ALGORITHM_IDENTIFIER algoID = { NULL, { 0, NULL } }; + HCRYPTKEY key; /* These all crash ret = CryptSignCertificate(0, 0, 0, NULL, 0, NULL, NULL, NULL, NULL); @@ -1680,7 +1680,7 @@ static void testSignCert(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, ok(!ret && (GetLastError() == NTE_BAD_KEYSET || GetLastError() == NTE_NO_KEY), "Expected NTE_BAD_KEYSET or NTE_NO_KEY, got %08x\n", GetLastError()); - ret = CryptGenKey(csp, AT_SIGNATURE, 0, key); + ret = CryptGenKey(csp, AT_SIGNATURE, 0, &key); ok(ret, "CryptGenKey failed: %08x\n", GetLastError()); if (ret) { @@ -1700,6 +1700,7 @@ static void testSignCert(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, size); } } + CryptDestroyKey(key); } } @@ -1809,7 +1810,6 @@ static void testCertSigs(void) HCRYPTPROV csp; CRYPT_DATA_BLOB toBeSigned = { sizeof(emptyCert), emptyCert }; BOOL ret; - HCRYPTKEY key; BYTE sig[64]; DWORD sigSize = sizeof(sig); @@ -1820,10 +1820,9 @@ static void testCertSigs(void) CRYPT_NEWKEYSET); ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); - testSignCert(csp, &toBeSigned, szOID_RSA_SHA1RSA, &key, sig, &sigSize); + testSignCert(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, &sigSize); testVerifyCertSig(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, sigSize); - CryptDestroyKey(key); CryptReleaseContext(csp, 0); ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET);

1 0

Juan Lang : winhttp: Use sk_ functions rather than accessing an OpenSSL stack type directly.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: a5facc9bdab28987560e70463aa9706eb9735fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5facc9bdab28987560e70463… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 4 16:41:53 2009 -0800 winhttp: Use sk_ functions rather than accessing an OpenSSL stack type directly. --- dlls/winhttp/net.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 21b1966..ea1afd3 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -124,6 +124,8 @@ MAKE_FUNCPTR( ERR_get_error ); MAKE_FUNCPTR( ERR_error_string ); MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); MAKE_FUNCPTR( i2d_X509 ); +MAKE_FUNCPTR( sk_value ); +MAKE_FUNCPTR( sk_num ); #undef MAKE_FUNCPTR static CRITICAL_SECTION *ssl_locks; @@ -339,11 +341,11 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) PCCERT_CONTEXT endCert = NULL; ret = TRUE; - for (i = 0; ret && i < ctx->chain->num; i++) + for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++) { PCCERT_CONTEXT context; - cert = (X509 *)ctx->chain->data[i]; + cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i); if ((context = X509_to_cert_context( cert ))) { if (i == 0) @@ -441,6 +443,8 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( ERR_error_string ); LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); LOAD_FUNCPTR( i2d_X509 ); + LOAD_FUNCPTR( sk_value ); + LOAD_FUNCPTR( sk_num ); #undef LOAD_FUNCPTR pSSL_library_init();

1 0

Huw Davies : winhttp: Load X509_STORE_CTX_get_ex_data from libcrypto not libssl.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 24b437942ef92396f14d693c795c8c54a214d006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b437942ef92396f14d693c7… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Dec 5 11:41:48 2009 +0000 winhttp: Load X509_STORE_CTX_get_ex_data from libcrypto not libssl. --- dlls/winhttp/net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 3ed3b1b..21b1966 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -115,7 +115,6 @@ MAKE_FUNCPTR( SSL_get_verify_result ); MAKE_FUNCPTR( SSL_get_peer_certificate ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); MAKE_FUNCPTR( SSL_CTX_set_verify ); -MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); MAKE_FUNCPTR( BIO_new_fp ); MAKE_FUNCPTR( CRYPTO_num_locks ); @@ -123,6 +122,7 @@ MAKE_FUNCPTR( CRYPTO_set_id_callback ); MAKE_FUNCPTR( CRYPTO_set_locking_callback ); MAKE_FUNCPTR( ERR_get_error ); MAKE_FUNCPTR( ERR_error_string ); +MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); MAKE_FUNCPTR( i2d_X509 ); #undef MAKE_FUNCPTR @@ -423,7 +423,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_get_peer_certificate ); LOAD_FUNCPTR( SSL_CTX_set_default_verify_paths ); LOAD_FUNCPTR( SSL_CTX_set_verify ); - LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); #undef LOAD_FUNCPTR #define LOAD_FUNCPTR(x) \ @@ -440,6 +439,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( CRYPTO_set_locking_callback ); LOAD_FUNCPTR( ERR_get_error ); LOAD_FUNCPTR( ERR_error_string ); + LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); LOAD_FUNCPTR( i2d_X509 ); #undef LOAD_FUNCPTR

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009