system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 02:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

mfplat: Allow NULL length pointer in IMFAttributes::GetAllocatedString.

Browse source 
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Andrew Eikum 2022-05-09 10:56:29 -05:00 committed by Alexandre Julliard
parent d686663d22
commit ca10760d2e
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/mfplat/main.c
View file

@ -2670,7 +2670,8 @@ HRESULT attributes_GetAllocatedString(struct attributes *attributes, REFGUID key
if (SUCCEEDED(hr))
{
*value = attrval.pwszVal;
*length = lstrlenW(*value);
if (length)
*length = lstrlenW(*value);
}
return hr;

5
dlls/mfplat/tests/mfplat.c
View file

@ -1638,6 +1638,11 @@ static void test_attributes(void)
ok(hr == S_OK, "Failed to get string length, hr %#lx.\n", hr);
ok(string_length == lstrlenW(stringW), "Unexpected length %u.\n", string_length);
hr = IMFAttributes_GetAllocatedString(attributes, &DUMMY_GUID1, &string, NULL);
ok(hr == S_OK, "Failed to get allocated string, hr %#lx.\n", hr);
ok(!lstrcmpW(string, stringW), "Unexpected string %s.\n", wine_dbgstr_w(string));
CoTaskMemFree(string);
string_length = 0xdeadbeef;
hr = IMFAttributes_GetAllocatedString(attributes, &DUMMY_GUID1, &string, &string_length);
ok(hr == S_OK, "Failed to get allocated string, hr %#lx.\n", hr);