ucrtbase: Correct day-of-week range for strftime.

Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jeff Smith 2019-11-21 18:28:10 -06:00 committed by Alexandre Julliard
parent bcb1aee8c7
commit bb3c3e8fec
2 changed files with 4 additions and 2 deletions

View File

@ -1405,6 +1405,8 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
return 0;
break;
case 'u':
if(!MSVCRT_CHECK_PMT(mstm->tm_wday>=0 && mstm->tm_wday<=6))
goto einval_error;
tmp = mstm->tm_wday ? mstm->tm_wday : 7;
if(!strftime_int(str, &ret, max, tmp, 0, 1, 7))
return 0;

View File

@ -959,11 +959,11 @@ static void test_strftime(void)
{"%#R", "0:0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
{"%T", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
{"%#T", "0:0:0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
{"%u", "", { 0, 0, 0, 1, 0, 117, -1, 0, 0 }, FALSE, TRUE},
{"%u", "", { 0, 0, 0, 1, 0, 117, -1, 0, 0 }},
{"%u", "7", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }},
{"%u", "1", { 0, 0, 0, 1, 0, 117, 1, 0, 0 }},
{"%u", "6", { 0, 0, 0, 1, 0, 117, 6, 0, 0 }},
{"%u", "", { 0, 0, 0, 1, 0, 117, 7, 0, 0 }, TRUE},
{"%u", "", { 0, 0, 0, 1, 0, 117, 7, 0, 0 }},
{"%h", "Jan", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
{"%I", "", { 0, 0, -1, 1, 0, 70, 4, 0, 0 }},
{"%I", "12", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},