From e68006d865e463694d1c539b8ef07402f39a316a Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Sat, 24 Apr 2021 20:07:21 +0200 Subject: [PATCH] Revert "Reduce wchar_t string length to minimum required." This reverts commit 57f8184c09fd1a688f327c25cddd08abd1317ecb. --- src/frontend/wdisp/windisp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/wdisp/windisp.c b/src/frontend/wdisp/windisp.c index a4a720e73..384da787c 100644 --- a/src/frontend/wdisp/windisp.c +++ b/src/frontend/wdisp/windisp.c @@ -761,9 +761,9 @@ int WIN_NewViewport(GRAPH *graph) 0, 0, WinLineWidth, i * 2 - 22, NULL, NULL, hInst, NULL); #else /* UTF-8 support */ - const int n_byte_wide = (int) strlen(graph->plotname); + const int n_byte_wide = 2 * (int) strlen(graph->plotname) + 1; wchar_t * const wtext = TMALLOC(wchar_t, n_byte_wide); - const int n_byte_wide2 = (int) strlen(WindowName); + const int n_byte_wide2 = 2 * (int) strlen(WindowName) + 1; wchar_t * const wtext2 = TMALLOC(wchar_t, n_byte_wide2); /* translate UTF-8 to UTF-16 */ MultiByteToWideChar(CP_UTF8, 0, graph->plotname, -1, wtext, n_byte_wide);