ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

userenv: GetProfilesDirectoryW accepts a NULL buffer.

This commit is contained in:
Hans Leidekker 2011-03-02 10:46:44 +01:00 committed by Alexandre Julliard
parent 837fc836aa
commit 1c6ea02ffa
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/userenv/tests/userenv.c
View File

@ -264,6 +264,23 @@ static void test_get_profiles_dir(void)
HeapFree(GetProcessHeap(), 0, buf);
HeapFree(GetProcessHeap(), 0, profiles_dir);
SetLastError(0xdeadbeef);
r = GetProfilesDirectoryW(NULL, NULL);
expect(FALSE, r);
expect_gle(ERROR_INVALID_PARAMETER);
cch = 0;
SetLastError(0xdeadbeef);
r = GetProfilesDirectoryW(NULL, &cch);
expect(FALSE, r);
expect_gle(ERROR_INSUFFICIENT_BUFFER);
ok(cch, "expected cch > 0\n");
SetLastError(0xdeadbeef);
r = GetProfilesDirectoryW(NULL, &cch);
expect(FALSE, r);
expect_gle(ERROR_INSUFFICIENT_BUFFER);
}
START_TEST(userenv)

4
dlls/userenv/userenv_main.c
View File

@ -201,7 +201,7 @@ BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize )
TRACE("%p %p\n", lpProfilesDir, lpcchSize );
if (!lpProfilesDir || !lpcchSize)
if (!lpcchSize)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@ -234,7 +234,7 @@ BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize )
}
expanded_len = ExpandEnvironmentStringsW(unexpanded_profiles_dir, NULL, 0);
/* The returned length doesn't include the NULL terminator. */
if (*lpcchSize < expanded_len - 1)
if (*lpcchSize < expanded_len - 1 || !lpProfilesDir)
{
*lpcchSize = expanded_len - 1;
SetLastError(ERROR_INSUFFICIENT_BUFFER);