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>

ucrtbase: Correct day-of-week range for strftime.
bb3c3e8f · Jeff Smith · Alexandre Julliard · bcb1aee8 · bb3c3e8f · bb3c3e8f
Commit bb3c3e8f authored Nov 21, 2019 by Jeff Smith Committed by Alexandre Julliard Nov 22, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

time.c dlls/msvcrt/time.c +2 -0

misc.c dlls/ucrtbase/tests/misc.c +2 -2

No files found.
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -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;

--- a/dlls/ucrtbase/tests/misc.c
+++ b/dlls/ucrtbase/tests/misc.c
@@ -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 }},