patch 7.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)

diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c
index cf6d9a77ae3f4760c13bca03b9061439232885d4..b1fbdaa35d90f7b1b71a219aa93224b828cfd7bc 100644 (file)
--- 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 83bfe2b08e1521a2a9e7e8c691bbba062045b6ee..71e1a2a8fdd3e239c8d6d5055f359debf4db98be 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    897,
 /**/
     896,
 /**/