Jeff Smith : ucrtbase: Treat year more consistently in strftime.
Alexandre Julliard
julliard at winehq.org
Fri Nov 22 16:17:25 CST 2019
Module: wine
Branch: master
Commit: a0be8d49f2e869d38e7e989f134362b4412349e4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0be8d49f2e869d38e7e989f134362b4412349e4
Author: Jeff Smith <whydoubt at gmail.com>
Date: Thu Nov 21 18:28:06 2019 -0600
ucrtbase: Treat year more consistently in strftime.
Signed-off-by: Jeff Smith <whydoubt at gmail.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcrt/time.c | 27 ++++++++++++++-------------
dlls/ucrtbase/tests/misc.c | 12 ++++++------
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index 4248fe4f85..8534738406 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -1190,6 +1190,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
{
MSVCRT_size_t ret, tmp;
BOOL alternate;
+ int year = mstm ? mstm->tm_year + 1900 : -1;
if(!str || !format) {
if(str && max)
@@ -1272,8 +1273,9 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
break;
#if _MSVCR_VER>=140
case 'C':
- tmp = (1900+mstm->tm_year)/100;
- if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99))
+ if(!MSVCRT_CHECK_PMT(year>=0 && year<=9999))
+ goto einval_error;
+ if(!strftime_int(str, &ret, max, year/100, alternate ? 0 : 2, 0, 99))
return 0;
break;
#endif
@@ -1283,6 +1285,8 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
break;
#if _MSVCR_VER>=140
case 'D':
+ if(!MSVCRT_CHECK_PMT(year>=0 && year<=9999))
+ goto einval_error;
if(!strftime_int(str, &ret, max, mstm->tm_mon+1, alternate ? 0 : 2, 1, 12))
return 0;
if(ret < max)
@@ -1291,7 +1295,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
return 0;
if(ret < max)
str[ret++] = '/';
- if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99))
+ if(!strftime_int(str, &ret, max, year%100, alternate ? 0 : 2, 0, 99))
return 0;
break;
case 'e':
@@ -1301,8 +1305,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
str[ret-2] = ' ';
break;
case 'F':
- tmp = 1900+mstm->tm_year;
- if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999))
+ if(!strftime_int(str, &ret, max, year, alternate ? 0 : 4, 0, 9999))
return 0;
if(ret < max)
str[ret++] = '-';
@@ -1315,7 +1318,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
break;
case 'g':
case 'G':
- tmp = 1900 + mstm->tm_year;
+ tmp = year;
if (mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 4 < 0)
tmp--;
else if(mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 5 > 365 + IsLeapYear(tmp))
@@ -1409,18 +1412,16 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
break;
case 'y':
#if _MSVCR_VER>=140
- if(!MSVCRT_CHECK_PMT(mstm->tm_year>=-1900 && mstm->tm_year<=8099))
- goto einval_error;
- tmp = (mstm->tm_year+1900)%100;
+ if(!MSVCRT_CHECK_PMT(year>=0 && year<=9999))
#else
- tmp = mstm->tm_year%100;
+ if(!MSVCRT_CHECK_PMT(year>=1900))
#endif
- if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99))
+ goto einval_error;
+ if(!strftime_int(str, &ret, max, year%100, alternate ? 0 : 2, 0, 99))
return 0;
break;
case 'Y':
- tmp = 1900+mstm->tm_year;
- if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999))
+ if(!strftime_int(str, &ret, max, year, alternate ? 0 : 4, 0, 9999))
return 0;
break;
case 'z':
diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c
index debf0b87a0..9c5045b66a 100644
--- a/dlls/ucrtbase/tests/misc.c
+++ b/dlls/ucrtbase/tests/misc.c
@@ -930,23 +930,23 @@ static void test_strftime(void)
BOOL todo;
BOOL todo_handler;
} tests[] = {
- {"%C", "", { 0, 0, 0, 1, 0, -2000, 4, 0, 0 }, FALSE, TRUE},
- {"%C", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }, TRUE},
+ {"%C", "", { 0, 0, 0, 1, 0, -2000, 4, 0, 0 }},
+ {"%C", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }},
{"%C", "00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }},
{"%C", "18", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }},
{"%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 }, FALSE, TRUE},
+ {"%C", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }},
{"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, TRUE},
{"%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, 1, 0, -1901, 4, 0, 0 }, FALSE, TRUE},
+ {"%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 }, TRUE},
+ {"%D", "01/01/99", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }},
{"%D", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
{"%D", "01/01/99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }},
- {"%D", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }, TRUE},
+ {"%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 }, TRUE},
{"%e", " 1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
More information about the wine-cvs
mailing list