From 24cf233ef9e92f947618c55d8bff423898a45c24 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 1 Jul 2016 12:50:54 +0200 Subject: patch 7.4.1969 Problem: When the netbeans channel is closed consuming the buffer may cause a crash. Solution: Check for nb_channel not to be NULL. (Xavier de Gaye) --- src/netbeans.c | 5 +++-- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/netbeans.c b/src/netbeans.c index 46d725bfa..f674a78a9 100644 --- a/src/netbeans.c +++ b/src/netbeans.c @@ -422,13 +422,14 @@ netbeans_parse_messages(void) buffer = node->rq_buffer; } - /* now, parse and execute the commands */ + /* Now, parse and execute the commands. This may set nb_channel to + * NULL if the channel is closed. */ nb_parse_cmd(buffer); if (own_node) /* buffer finished, dispose of it */ vim_free(buffer); - else + else if (nb_channel != NULL) /* more follows, move it to the start */ channel_consume(nb_channel, PART_SOCK, (int)(p - buffer)); } diff --git a/src/version.c b/src/version.c index 2a3ded763..8e9da45f8 100644 --- a/src/version.c +++ b/src/version.c @@ -753,6 +753,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1969, /**/ 1968, /**/ -- cgit v1.2.1