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

kernel32: Improve parameter validation for ReadConsoleOutputAttribute.

This commit is contained in:
Andrew Nguyen 2011-01-11 05:11:34 -06:00 committed by Alexandre Julliard
parent 66b42c86d1
commit b158d23c88
2 changed files with 93 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/kernel32/console.c
View File

@ -908,6 +908,14 @@ BOOL WINAPI ReadConsoleOutputAttribute(HANDLE hConsoleOutput, LPWORD lpAttribute
TRACE("(%p,%p,%d,%dx%d,%p)\n",
hConsoleOutput, lpAttribute, length, coord.X, coord.Y, read_count);
if (!read_count)
{
SetLastError(ERROR_INVALID_ACCESS);
return FALSE;
}
*read_count = 0;
SERVER_START_REQ( read_console_output )
{
req->handle = console_handle_unmap(hConsoleOutput);
@ -917,9 +925,7 @@ BOOL WINAPI ReadConsoleOutputAttribute(HANDLE hConsoleOutput, LPWORD lpAttribute
req->wrap = TRUE;
wine_server_set_reply( req, lpAttribute, length * sizeof(WORD) );
if ((ret = !wine_server_call_err( req )))
{
if (read_count) *read_count = wine_server_reply_size(reply) / sizeof(WORD);
}
*read_count = wine_server_reply_size(reply) / sizeof(WORD);
}
SERVER_END_REQ;
return ret;

84
dlls/kernel32/tests/console.c
View File

@ -2023,6 +2023,89 @@ static void test_ReadConsoleOutputCharacterW(HANDLE output_handle)
ok(count == 1, "Expected count to be 1, got %u\n", count);
}
static void test_ReadConsoleOutputAttribute(HANDLE output_handle)
{
WORD attr;
COORD origin = {0, 0};
DWORD count;
BOOL ret;
int i;
const struct
{
HANDLE hConsoleOutput;
LPWORD lpAttribute;
DWORD length;
COORD coord;
LPDWORD read_count;
DWORD expected_count;
DWORD last_error;
int win7_crash;
} invalid_table[] =
{
{NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
{NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{NULL, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1},
{NULL, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{NULL, &attr, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
{NULL, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{NULL, &attr, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
{INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
{INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1},
{INVALID_HANDLE_VALUE, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{INVALID_HANDLE_VALUE, &attr, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
{INVALID_HANDLE_VALUE, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{INVALID_HANDLE_VALUE, &attr, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
{output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{output_handle, NULL, 1, origin, &count, 1, ERROR_INVALID_ACCESS, 1},
{output_handle, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{output_handle, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
};
for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
{
if (invalid_table[i].win7_crash)
continue;
SetLastError(0xdeadbeef);
if (invalid_table[i].read_count) count = 0xdeadbeef;
ret = ReadConsoleOutputAttribute(invalid_table[i].hConsoleOutput,
invalid_table[i].lpAttribute,
invalid_table[i].length,
invalid_table[i].coord,
invalid_table[i].read_count);
ok(!ret, "[%d] Expected ReadConsoleOutputAttribute to return FALSE, got %d\n", i, ret);
if (invalid_table[i].read_count)
{
ok(count == invalid_table[i].expected_count,
"[%d] Expected count to be %u, got %u\n",
i, invalid_table[i].expected_count, count);
}
ok(GetLastError() == invalid_table[i].last_error,
"[%d] Expected last error to be %u, got %u\n",
i, invalid_table[i].last_error, GetLastError());
}
count = 0xdeadbeef;
ret = ReadConsoleOutputAttribute(output_handle, NULL, 0, origin, &count);
ok(ret == TRUE, "Expected ReadConsoleOutputAttribute to return TRUE, got %d\n", ret);
ok(count == 0, "Expected count to be 0, got %u\n", count);
count = 0xdeadbeef;
ret = ReadConsoleOutputAttribute(output_handle, &attr, 0, origin, &count);
ok(ret == TRUE, "Expected ReadConsoleOutputAttribute to return TRUE, got %d\n", ret);
ok(count == 0, "Expected count to be 0, got %u\n", count);
count = 0xdeadbeef;
ret = ReadConsoleOutputAttribute(output_handle, &attr, 1, origin, &count);
ok(ret == TRUE, "Expected ReadConsoleOutputAttribute to return TRUE, got %d\n", ret);
ok(count == 1, "Expected count to be 1, got %u\n", count);
}
START_TEST(console)
{
static const char font_name[] = "Lucida Console";
@ -2139,4 +2222,5 @@ START_TEST(console)
test_FillConsoleOutputAttribute(hConOut);
test_ReadConsoleOutputCharacterA(hConOut);
test_ReadConsoleOutputCharacterW(hConOut);
test_ReadConsoleOutputAttribute(hConOut);
}