From caf6434ac937cf26050276d7b474be2d2d6a06b3 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 2 Mar 2017 22:11:33 +0100 Subject: [PATCH] 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) --- src/evalfunc.c | 3 ++- src/testdir/test_functions.vim | 5 +++++ src/version.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/evalfunc.c b/src/evalfunc.c index 70b90ad175..20c5f8975c 100644 --- 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 218567ff46..eeeb4e3253 100644 --- 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 c1f426cb3d..5a10b4772a 100644 --- 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, /**/ -- 2.47.2