commit 1abb502635c7f317e05a0cf3ea067101f9d684f5
author Bram Moolenaar <Bram@vim.org> Tue Mar 15 13:33:55 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Tue Mar 15 13:33:55 2016 +0100
tree 5795aacec573dc3d1b9f8f54834d325b782189fd
parent 4f118be2bb987cdf313da879d2a93ae125e99202

patch 7.4.1567
Problem:    Crash in assert_fails().
Solution:   Check for NULL. (Dominique Pelle)  Add a test.

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index fd028cc..7776cc6 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -9386,7 +9386,8 @@
 	char_u	buf[NUMBUFLEN];
 	char	*error = (char *)get_tv_string_buf_chk(&argvars[1], buf);
 
-	if (strstr((char *)vimvars[VV_ERRMSG].vv_str, error) == NULL)
+	if (error == NULL
+		  || strstr((char *)vimvars[VV_ERRMSG].vv_str, error) == NULL)
 	{
 	    prepare_assert_error(&ga);
 	    fill_assert_error(&ga, &argvars[2], NULL, &argvars[1],