msvcrt: Call invalid parameter handler for out-of-range integer.

Signed-off-by: Jeff Smith <whydoubt@gmail.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Call invalid parameter handler for out-of-range integer.
8fe3d7c9 · Jeff Smith · Alexandre Julliard · eea87600 · 8fe3d7c9 · 8fe3d7c9
Commit 8fe3d7c9 authored Nov 25, 2019 by Jeff Smith Committed by Alexandre Julliard Nov 25, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

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

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

No files found.
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -996,9 +996,8 @@ static inline BOOL strftime_int(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCRT_s
 #endif
    MSVCRT_size_t len;

-    if(src<l || src>h) {
+    if(!MSVCRT_CHECK_PMT(src>=l && src<=h)) {
        *str = 0;
-        *MSVCRT__errno() = MSVCRT_EINVAL;
        return FALSE;
    }


--- a/dlls/ucrtbase/tests/misc.c
+++ b/dlls/ucrtbase/tests/misc.c
@@ -937,10 +937,10 @@ static void test_strftime(void)
        {"%C", "19", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
        {"%C", "99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }},
        {"%C", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }},
-        {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, FALSE, TRUE},
+        {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }},
        {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
        {"%d", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }},
-        {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE},
+        {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }},
        {"%D", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }},
        {"%D", "01/01/00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }},
        {"%D", "01/01/99", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }},
@@ -948,10 +948,10 @@ static void test_strftime(void)
        {"%D", "01/01/99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }},
        {"%D", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }},
        {"%#D", "1/1/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
-        {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, FALSE, TRUE},
+        {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }},
        {"%e", " 1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
        {"%e", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }},
-        {"%e", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE},
+        {"%e", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }},
        {"%#e", "1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
        {"%F", "1970-01-01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
        {"%#F", "1970-1-1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},