From 2d23512da1c4311b828eff9622a32d65102b2b63 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Wed, 4 Dec 2019 15:30:03 +0100 Subject: [PATCH] msvcrt: Don't depend on how __lc_time_data was allocated in _W_Getdays. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e0c62530441..617d1fffb3c 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -494,11 +494,14 @@ MSVCRT_wchar_t* CDECL _W_Getdays(void) { MSVCRT___lc_time_data *cur = get_locinfo()->lc_time_curr; MSVCRT_wchar_t *out; - int i, len, size; + int i, len, size = 0; TRACE("\n"); - size = cur->wstr.names.short_mon[0]-cur->wstr.names.short_wday[0]; + for(i=0; i<7; i++) { + size += strlenW(cur->wstr.names.short_wday[i]) + 1; + size += strlenW(cur->wstr.names.wday[i]) + 1; + } out = MSVCRT_malloc((size+1)*sizeof(*out)); if(!out) return NULL;