Mercurial > vim

changeset 11020:50f3e37bc210 v8.0.0399

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0399: crash when using balloon_show() when not supported commit https://github.com/vim/vim/commit/caf6434ac937cf26050276d7b474be2d2d6a06b3 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Mar 2 22:11:33 2017 +0100 patch 8.0.0399: crash when using balloon_show() when not supported Problem: Crash when using balloon_show() when not supported. (Hirohito Higashi) Solution: Check for balloonEval not to be NULL. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Thu, 02 Mar 2017 22:15:04 +0100
parents 05daa23e1ecf
children 44b7e807403c
files src/evalfunc.c src/testdir/test_functions.vim src/version.c
diffstat 3 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -1375,7 +1375,8 @@ f_atan2(typval_T *argvars, typval_T *ret
     static void
 f_balloon_show(typval_T *argvars, typval_T *rettv UNUSED)
 {
-    gui_mch_post_balloon(balloonEval, get_tv_string_chk(&argvars[0]));
+    if (balloonEval != NULL)
+	gui_mch_post_balloon(balloonEval, get_tv_string_chk(&argvars[0]));
 }
 #endif
 
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -466,3 +466,8 @@ func Test_getbufvar()
 
   set fileformats&
 endfunc
+
+func Test_balloon_show()
+  " This won't do anything but must not crash either.
+  call balloon_show('hi!')
+endfunc
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    399,
+/**/
     398,
 /**/
     397,