patch 7.4.1329
Problem: Crash when using channel that failed to open.
Solution: Check for NULL. Update messages. (Yukihiro Nakadaira)
diff --git a/src/channel.c b/src/channel.c
index d5d7ffb..003c933 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -634,7 +634,7 @@
{
/* Get here when the server can't be found. */
ch_error(NULL, "Cannot connect to port after retry\n");
- PERROR(_("E899: Cannot connect to port after retry2"));
+ PERROR(_("E899: Cannot connect to port after retry"));
sock_close(sd);
channel_free(channel);
return NULL;
@@ -1220,7 +1220,7 @@
void
channel_close(channel_T *channel)
{
- ch_log(channel, "Closing channel");
+ ch_log(channel, "Closing channel\n");
#ifdef FEAT_GUI
channel_gui_unregister(channel);
diff --git a/src/eval.c b/src/eval.c
index a90dd0b..ff7f9a7 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -21828,7 +21828,10 @@
channel_T *channel = varp->vval.v_channel;
char *status = channel_status(channel);
- vim_snprintf((char *)buf, NUMBUFLEN,
+ if (channel == NULL)
+ vim_snprintf((char *)buf, NUMBUFLEN, "channel %s", status);
+ else
+ vim_snprintf((char *)buf, NUMBUFLEN,
"channel %d %s", channel->ch_id, status);
return buf;
}
@@ -22467,7 +22470,8 @@
case VAR_CHANNEL:
#ifdef FEAT_CHANNEL
to->vval.v_channel = from->vval.v_channel;
- ++to->vval.v_channel->ch_refcount;
+ if (to->vval.v_channel != NULL)
+ ++to->vval.v_channel->ch_refcount;
break;
#endif
case VAR_STRING:
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index e7448fa..7cc3f14 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -318,3 +318,9 @@
func Test_unlet_handle()
call s:run_server('s:unlet_handle')
endfunc
+
+func Test_open_fail()
+ silent! let ch = ch_open("noserver")
+ echo ch
+ let d = ch
+endfunc
diff --git a/src/version.c b/src/version.c
index c880078..fc1c882 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1329,
+/**/
1328,
/**/
1327,
