Commit 2a7c4ea8 authored by Theodore Dubois's avatar Theodore Dubois Committed by Alexandre Julliard

shell32/tests: Fix memory leaks.

parent fbbac885
...@@ -104,7 +104,7 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW ...@@ -104,7 +104,7 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW
{ {
IQueryAssociations *assoc; IQueryAssociations *assoc;
HRESULT hr; HRESULT hr;
WCHAR *buffer; WCHAR *buffer = NULL;
DWORD len; DWORD len;
hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc);
...@@ -115,8 +115,11 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW ...@@ -115,8 +115,11 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW
hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, NULL, &len); hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, NULL, &len);
if (expected_string) { if (expected_string) {
ok_(__FILE__, line)(hr == S_FALSE, "GetString returned 0x%x, expected S_FALSE\n", hr); ok_(__FILE__, line)(hr == S_FALSE, "GetString returned 0x%x, expected S_FALSE\n", hr);
if (hr != S_FALSE) if (hr != S_FALSE) {
return; /* don't try to allocate memory */ /* don't try to allocate memory using unitialized len */
IQueryAssociations_Release(assoc);
return;
}
buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); ok_(__FILE__, line)(buffer != NULL, "out of memory\n");
...@@ -128,6 +131,9 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW ...@@ -128,6 +131,9 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW
} else { } else {
ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr);
} }
IQueryAssociations_Release(assoc);
HeapFree(GetProcessHeap(), 0, buffer);
} }
static void test_IQueryAssociations_GetString(void) static void test_IQueryAssociations_GetString(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment