From 14ad611ca435d97e8fd0d9ab03ddc982843298ac Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 1 Feb 2016 21:47:13 +0100
Subject: [PATCH] patch 7.4.1233 Problem:    Channel command may cause a crash.
 Solution:   Check for NULL argument. (Damien)

---
 src/channel.c | 4 +++-
 src/version.c | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/channel.c b/src/channel.c
index f329250973..8cb9a352ee 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -629,6 +629,8 @@ channel_exe_cmd(int idx, char_u *cmd, typval_T *arg2, typval_T *arg3)
 	return;
     }
     arg = arg2->vval.v_string;
+    if (arg == NULL)
+	arg = (char_u *)"";
 
     if (STRCMP(cmd, "ex") == 0)
     {
@@ -647,7 +649,7 @@ channel_exe_cmd(int idx, char_u *cmd, typval_T *arg2, typval_T *arg3)
     {
 	exarg_T ea;
 
-	ea.forceit = arg != NULL && *arg != NUL;
+	ea.forceit = *arg != NUL;
 	ex_redraw(&ea);
 	showruler(FALSE);
 	setcursor();
diff --git a/src/version.c b/src/version.c
index 04231004f6..1bb4030f99 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 */
+/**/
+    1233,
 /**/
     1232,
 /**/