[PATCH v5 09/10] winex11: Always zero terminate XIM composition string.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winex11.drv/xim.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index eedfdd06eac..cba737c333f 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -85,11 +85,11 @@ static void xim_update_preedit_string( UINT offset, UINT old_len, WCHAR *text, U

TRACE( "offset %u, old_len %u, text %s\n", offset, old_len, debugstr_wn(text, new_len) );

-    if (preedit_len + diff >= preedit_max)
+    if (!preedit_buf || preedit_len + diff >= preedit_max)
     {
         WCHAR *tmp;

-        if (!(tmp = realloc( preedit_buf, (preedit_max + diff) * sizeof(WCHAR) )))
+        if (!(tmp = realloc( preedit_buf, (preedit_max + diff + 1) * sizeof(WCHAR) )))
         {
             ERR("Couldn't expand composition string buffer\n");
             return;
@@ -103,6 +103,7 @@ static void xim_update_preedit_string( UINT offset, UINT old_len, WCHAR *text, U
              (preedit_len - offset - old_len) * sizeof(WCHAR) );
     if (text) memcpy( preedit_buf + offset, text, new_len * sizeof(WCHAR) );
     preedit_len += diff;
+    preedit_buf[preedit_len] = 0;

x11drv_client_func( client_func_ime_set_composition_string, preedit_buf, preedit_len * sizeof(WCHAR) );
 }
@@ -114,8 +115,9 @@ void X11DRV_XIMLookupChars( const char *str, UINT count )

TRACE("%p %u\n", str, count);

-    if (!(output = malloc( count * sizeof(WCHAR) ))) return;
+    if (!(output = malloc( (count + 1) * sizeof(WCHAR) ))) return;
     len = ntdll_umbstowcs( str, count, output, count );
+    output[len] = 0;

x11drv_client_func( client_func_ime_set_result, output, len * sizeof(WCHAR) );
     free( output );