summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-10-13 20:21:49 +0200
committerBram Moolenaar <Bram@vim.org>2015-10-13 20:21:49 +0200
commit4e86150ec5b5158da92b28938ea55819dc890a14 (patch)
treeb83b68ce4d21ccb04bec05bdddbd97c78bc679fc
parentb4f6a46b01ed00b642a2271e9d1559e51ab0f2c4 (diff)
patch 7.4.897v7.4.897
Problem: Freeze and crash when there is a sleep in a remote command. (Karl Yngve LervÄg) Solution: Remove a message from the queue before dealing with it. (James Kolb)
-rw-r--r--src/if_xcmdsrv.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c
index cf6d9a77ae..b1fbdaa35d 100644
--- a/src/if_xcmdsrv.c
+++ b/src/if_xcmdsrv.c
@@ -1235,9 +1235,9 @@ server_parse_messages()
while (head.next != NULL && head.next != &head)
{
node = head.next;
- server_parse_message(X_DISPLAY, node->propInfo, node->len);
head.next = node->next;
node->next->prev = node->prev;
+ server_parse_message(X_DISPLAY, node->propInfo, node->len);
vim_free(node);
}
}
diff --git a/src/version.c b/src/version.c
index 83bfe2b08e..71e1a2a8fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 897,
+/**/
896,
/**/
895,