From 15bf76d40be1f1622ff5cc16596c308e76e2ca94 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 18 Mar 2017 16:18:37 +0100 Subject: patch 8.0.0474: the client-server feature is not tested Problem: The client-server feature is not tested. Solution: Add a test. --- src/os_mswin.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/os_mswin.c') diff --git a/src/os_mswin.c b/src/os_mswin.c index a713ea190..166305298 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -2105,11 +2105,15 @@ Messaging_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) str = serverConvert(client_enc, (char_u *)data->lpData, &tofree); res = eval_client_expr_to_string(str); - vim_free(tofree); if (res == NULL) { - res = vim_strsave((char_u *)_(e_invexprmsg)); + char *err = _(e_invexprmsg); + size_t len = STRLEN(str) + STRLEN(err) + 5; + + res = alloc(len); + if (res != NULL) + vim_snprintf((char *)res, len, "%s: \"%s\"", err, str); reply.dwData = COPYDATA_ERROR_RESULT; } else @@ -2120,6 +2124,7 @@ Messaging_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) serverSendEnc(sender); retval = (int)SendMessage(sender, WM_COPYDATA, (WPARAM)message_window, (LPARAM)(&reply)); + vim_free(tofree); vim_free(res); return retval; -- cgit v1.2.1