[PATCH v2 2/2] kernelbase: Fix infinite loop in Internal_EnumCalendarInfo.
Jinoh Kang
jinoh.kang.kr at gmail.com
Mon Nov 29 20:36:36 CST 2021
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52129
Signed-off-by: Jinoh Kang <jinoh.kang.kr at gmail.com>
---
dlls/kernel32/tests/locale.c | 24 ------------------------
dlls/kernelbase/locale.c | 24 +++++++++++++++---------
2 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index a5c2ad1068d..94c9ce3ad1b 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -7045,12 +7045,6 @@ static void test_EnumCalendarInfoA(void)
{
INT i;
- if (!strcmp(winetest_platform, "wine"))
- {
- skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n");
- return;
- }
-
ok( EnumCalendarInfoA( calinfo_procA,
LOCALE_USER_DEFAULT,
ENUM_ALL_CALENDARS,
@@ -7079,12 +7073,6 @@ static void test_EnumCalendarInfoW(void)
{
INT i;
- if (!strcmp(winetest_platform, "wine"))
- {
- skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n");
- return;
- }
-
ok( EnumCalendarInfoW( calinfo_procW,
LOCALE_USER_DEFAULT,
ENUM_ALL_CALENDARS,
@@ -7114,12 +7102,6 @@ static void test_EnumCalendarInfoExA(void)
{
INT i;
- if (!strcmp(winetest_platform, "wine"))
- {
- skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n");
- return;
- }
-
ok( EnumCalendarInfoExA( calinfoex_procA,
LOCALE_USER_DEFAULT,
ENUM_ALL_CALENDARS,
@@ -7149,12 +7131,6 @@ static void test_EnumCalendarInfoExW(void)
{
INT i;
- if (!strcmp(winetest_platform, "wine"))
- {
- skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n");
- return;
- }
-
ok( EnumCalendarInfoExW( calinfoex_procW,
LOCALE_USER_DEFAULT,
ENUM_ALL_CALENDARS,
diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index 10f3b2698b5..779d6071ab0 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -2722,13 +2722,13 @@ static DWORD get_timezone_id( const TIME_ZONE_INFORMATION *info, LARGE_INTEGER t
/******************************************************************************
* Internal_EnumCalendarInfo (kernelbase.@)
*/
-BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, LCID lcid, CALID id,
+BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, LCID lcid, CALID id_or_all,
CALTYPE type, BOOL unicode, BOOL ex,
BOOL exex, LPARAM lparam )
{
WCHAR buffer[256];
- DWORD optional = 0;
- INT ret;
+ CALID calendars[2], id;
+ INT ret, i;
if (!proc)
{
@@ -2736,16 +2736,24 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc,
return FALSE;
}
- if (id == ENUM_ALL_CALENDARS)
+ if (id_or_all == ENUM_ALL_CALENDARS)
{
if (!GetLocaleInfoW( lcid, LOCALE_ICALENDARTYPE | LOCALE_RETURN_NUMBER,
- (WCHAR *)&id, sizeof(id) / sizeof(WCHAR) )) return FALSE;
+ (WCHAR *)&calendars[0], sizeof(calendars[0]) / sizeof(WCHAR) )) return FALSE;
if (!GetLocaleInfoW( lcid, LOCALE_IOPTIONALCALENDAR | LOCALE_RETURN_NUMBER,
- (WCHAR *)&optional, sizeof(optional) / sizeof(WCHAR) )) optional = 0;
+ (WCHAR *)&calendars[1], sizeof(calendars[1]) / sizeof(WCHAR) )) calendars[1] = 0;
+ }
+ else
+ {
+ calendars[0] = id_or_all;
+ calendars[1] = 0;
}
- for (;;)
+ for (i = 0; i < ARRAY_SIZE(calendars); i++)
{
+ id = calendars[i];
+ if (!id) continue;
+
if (type & CAL_RETURN_NUMBER)
ret = GetCalendarInfoW( lcid, id, type, NULL, 0, (LPDWORD)buffer );
else if (unicode)
@@ -2764,8 +2772,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc,
else ret = proc( buffer );
}
if (!ret) break;
- if (!optional) break;
- id = optional;
}
return TRUE;
}
--
2.31.1
More information about the wine-devel
mailing list