diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-03-19 21:20:53 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-03-19 21:20:53 +0100 |
commit | 81b9d0bd5c705815e903e671e81b0b05828efd9c (patch) | |
tree | 3e832c3269ad004ee414c81b5ddbd65ae93ad9d5 /src/proto/if_xcmdsrv.pro | |
parent | bfd830d3e2dbd1e9b14c65625f18773074e6ac67 (diff) | |
download | vim-git-81b9d0bd5c705815e903e671e81b0b05828efd9c.tar.gz |
patch 8.0.0492: a failing client-server request can make Vim hangv8.0.0492
Problem: A failing client-server request can make Vim hang.
Solution: Add a timeout argument to functions that wait.
Diffstat (limited to 'src/proto/if_xcmdsrv.pro')
-rw-r--r-- | src/proto/if_xcmdsrv.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/proto/if_xcmdsrv.pro b/src/proto/if_xcmdsrv.pro index 137020e13..801dc00e0 100644 --- a/src/proto/if_xcmdsrv.pro +++ b/src/proto/if_xcmdsrv.pro @@ -1,11 +1,11 @@ /* if_xcmdsrv.c */ int serverRegisterName(Display *dpy, char_u *name); void serverChangeRegisteredWindow(Display *dpy, Window newwin); -int serverSendToVim(Display *dpy, char_u *name, char_u *cmd, char_u **result, Window *server, int asExpr, int localLoop, int silent); +int serverSendToVim(Display *dpy, char_u *name, char_u *cmd, char_u **result, Window *server, int asExpr, int timeout, int localLoop, int silent); char_u *serverGetVimNames(Display *dpy); Window serverStrToWin(char_u *str); int serverSendReply(char_u *name, char_u *str); -int serverReadReply(Display *dpy, Window win, char_u **str, int localLoop); +int serverReadReply(Display *dpy, Window win, char_u **str, int localLoop, int timeout); int serverPeekReply(Display *dpy, Window win, char_u **str); void serverEventProc(Display *dpy, XEvent *eventPtr, int immediate); void server_parse_messages(void); |