patch 7.4.1233

brammool · brammool · commit 14ad611ca435 · 2016-02-01T21:47:13.000+01:00
Problem:    Channel command may cause a crash.
Solution:   Check for NULL argument. (Damien)
diff --git 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
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1233,
 /**/
     1232,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -629,6 +629,8 @@ channel_exe_cmd(int idx, char_u cmd, typval_T arg2, typval_T *arg3)`
`629`	`629`	`return;`
`630`	`630`	`}`
`631`	`631`	`arg = arg2->vval.v_string;`
	`632`	`+ if (arg == NULL)`
	`633`	`+ arg = (char_u *)"";`
`632`	`634`
`633`	`635`	`if (STRCMP(cmd, "ex") == 0)`
`634`	`636`	`{`
`@@ -647,7 +649,7 @@ channel_exe_cmd(int idx, char_u cmd, typval_T arg2, typval_T *arg3)`
`647`	`649`	`{`
`648`	`650`	`exarg_T ea;`
`649`	`651`
`650`		`- ea.forceit = arg != NULL && *arg != NUL;`
	`652`	`+ ea.forceit = *arg != NUL;`
`651`	`653`	`ex_redraw(&ea);`
`652`	`654`	`showruler(FALSE);`
`653`	`655`	`setcursor();`