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)

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 70b90ad175355c082fe96e8fb625aa0dafe5fc5e..20c5f8975c92f1763658d8e22b6dfb14e84a40b9 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -1375,7 +1375,8 @@ f_atan2(typval_T *argvars, typval_T *rettv)
     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
 

diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 218567ff46c8bb072b8c57e857d0af29b6ca5f3c..eeeb4e32532c0c5283ae93ab7e016761c5696d0d 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index c1f426cb3df20989f3529cbd2f1bda9984488f2c..5a10b4772a45ffea2b06641f05226519a50b3423 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    399,
 /**/
     398,
 /**/