# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1454360405 -3600
# Node ID 4b9d4600166fad472dd6f1b8057697a03dc23aa4
# Parent  c5eb970c8c877334641e4a8bf37246fedd5db987
commit https://github.com/vim/vim/commit/14ad611ca435d97e8fd0d9ab03ddc982843298ac
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Feb 1 21:47:13 2016 +0100

    patch 7.4.1233
    Problem:    Channel command may cause a crash.
    Solution:   Check for NULL argument. (Damien)

diff --git a/src/channel.c b/src/channel.c
--- a/src/channel.c
+++ b/src/channel.c
@@ -629,6 +629,8 @@ channel_exe_cmd(int idx, char_u *cmd, ty
 	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, ty
     {
 	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
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1233,
+/**/
     1232,
 /**/
     1231,