Mercurial > vim

diff src/eval.c @ 7675:eb9cc96138a3 v7.4.1136

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/da5dcd936656f524dd0ae7cb2685245f07f5720f Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jan 19 14:31:20 2016 +0100 patch 7.4.1136 Problem: Wrong argument to assert_exception() causes a crash. (reported by Coverity) Solution: Check for NULL pointer. Add a test.
author Christian Brabandt <cb@256bit.org>
date Tue, 19 Jan 2016 14:45:05 +0100
parents 1fded31d9e04
children ec434c82f72c
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -9278,7 +9278,8 @@ f_assert_exception(argvars, rettv)
 	assert_error(&ga);
 	ga_clear(&ga);
     }
-    else if (strstr((char *)vimvars[VV_EXCEPTION].vv_str, error) == NULL)
+    else if (error != NULL
+	    && strstr((char *)vimvars[VV_EXCEPTION].vv_str, error) == NULL)
     {
 	prepare_assert_error(&ga);
 	fill_assert_error(&ga, &argvars[1], NULL, &argvars[0],