From 53b9a53c27fcb43689015dbfc9fbf3ee0137ea78 Mon Sep 17 00:00:00 2001 From: Kusanagi Kouichi Date: Fri, 21 Mar 2008 04:52:49 +0900 Subject: [PATCH] winex11.drv: Fix crash by long preedit text. --- dlls/winex11.drv/xim.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index a586af28da..ad28bc5b50 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -293,9 +293,6 @@ static void XIMPreEditDoneCallback(XIC ic, XPointer client_data, XPointer call_d static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, XIMPreeditDrawCallbackStruct *P_DR) { - DWORD dwOutput; - WCHAR wcOutput[64]; - TRACE("PreEditDrawCallback %p\n",ic); if (P_DR) @@ -306,14 +303,25 @@ static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, { if (! P_DR->text->encoding_is_wchar) { + DWORD dwOutput; + WCHAR *wcOutput; + TRACE("multibyte\n"); dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, P_DR->text->string.multi_byte, -1, - wcOutput, 64); + NULL, 0); + wcOutput = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR) * dwOutput); + if (wcOutput) + { + dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, + P_DR->text->string.multi_byte, -1, + wcOutput, dwOutput); - /* ignore null */ - dwOutput --; - X11DRV_ImmSetInternalString (GCS_COMPSTR, sel, len, wcOutput, dwOutput); + /* ignore null */ + dwOutput --; + X11DRV_ImmSetInternalString (GCS_COMPSTR, sel, len, wcOutput, dwOutput); + HeapFree(GetProcessHeap(), 0, wcOutput); + } } else {