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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8fe3d7c9134eaac35def84ed4ead50c571469529
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8fe3d7c9134eaac35def84ed4...

Author: Jeff Smith <whydoubt(a)gmail.com>
Date:   Mon Nov 25 08:10:05 2019 -0600

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

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

---

 dlls/msvcrt/time.c         | 3 +--
 dlls/ucrtbase/tests/misc.c | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index 84e725747f..0d5b64a4aa 100644
--- 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;
     }
 
diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c
index 93a78a5de7..6314662eac 100644
--- 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 }},