Mercurial > vim
diff src/main.c @ 11211:71311d899b42 v8.0.0492
patch 8.0.0492: a failing client-server request can make Vim hang
commit https://github.com/vim/vim/commit/81b9d0bd5c705815e903e671e81b0b05828efd9c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 19 21:20:53 2017 +0100
patch 8.0.0492: a failing client-server request can make Vim hang
Problem: A failing client-server request can make Vim hang.
Solution: Add a timeout argument to functions that wait.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 19 Mar 2017 21:30:05 +0100 |
| parents | 49fda934f7e8 |
| children | 2e4877acfe0a |
line wrap: on
line diff
--- a/src/main.c +++ b/src/main.c @@ -3791,10 +3791,10 @@ cmdsrv_main( } else ret = serverSendToVim(xterm_dpy, sname, *serverStr, - NULL, &srv, 0, 0, silent); + NULL, &srv, 0, 0, 0, silent); # else /* Win32 always works? */ - ret = serverSendToVim(sname, *serverStr, NULL, &srv, 0, silent); + ret = serverSendToVim(sname, *serverStr, NULL, &srv, 0, 0, silent); # endif if (ret < 0) { @@ -3854,11 +3854,11 @@ cmdsrv_main( while (memchr(done, 0, numFiles) != NULL) { # ifdef WIN32 - p = serverGetReply(srv, NULL, TRUE, TRUE); + p = serverGetReply(srv, NULL, TRUE, TRUE, 0); if (p == NULL) break; # else - if (serverReadReply(xterm_dpy, srv, &p, TRUE) < 0) + if (serverReadReply(xterm_dpy, srv, &p, TRUE, -1) < 0) break; # endif j = atoi((char *)p); @@ -3885,12 +3885,12 @@ cmdsrv_main( # ifdef WIN32 /* Win32 always works? */ if (serverSendToVim(sname, (char_u *)argv[i + 1], - &res, NULL, 1, FALSE) < 0) + &res, NULL, 1, 0, FALSE) < 0) # else if (xterm_dpy == NULL) mch_errmsg(_("No display: Send expression failed.\n")); else if (serverSendToVim(xterm_dpy, sname, (char_u *)argv[i + 1], - &res, NULL, 1, 1, FALSE) < 0) + &res, NULL, 1, 0, 1, FALSE) < 0) # endif { if (res != NULL && *res != NUL)