Mercurial > vim

comparison 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
comparison
equal deleted inserted replaced
7674:c82fa18b578b 7675:eb9cc96138a3
9276 prepare_assert_error(&ga); 9276 prepare_assert_error(&ga);
9277 ga_concat(&ga, (char_u *)"v:exception is not set"); 9277 ga_concat(&ga, (char_u *)"v:exception is not set");
9278 assert_error(&ga); 9278 assert_error(&ga);
9279 ga_clear(&ga); 9279 ga_clear(&ga);
9280 } 9280 }
9281 else if (strstr((char *)vimvars[VV_EXCEPTION].vv_str, error) == NULL) 9281 else if (error != NULL
9282 && strstr((char *)vimvars[VV_EXCEPTION].vv_str, error) == NULL)
9282 { 9283 {
9283 prepare_assert_error(&ga); 9284 prepare_assert_error(&ga);
9284 fill_assert_error(&ga, &argvars[1], NULL, &argvars[0], 9285 fill_assert_error(&ga, &argvars[1], NULL, &argvars[0],
9285 &vimvars[VV_EXCEPTION].vv_tv); 9286 &vimvars[VV_EXCEPTION].vv_tv);
9286 assert_error(&ga); 9287 assert_error(&ga);