Mercurial > vim
diff src/evalfunc.c @ 17159:3fd0765f454f v8.1.1579
patch 8.1.1579: dict and list could be GC'ed while displaying error
commit https://github.com/vim/vim/commit/adc6714aac20f5462a0ecec50ab4806b2f3ab0db
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 22 01:40:42 2019 +0200
patch 8.1.1579: dict and list could be GC'ed while displaying error
Problem: Dict and list could be GC'ed while displaying error in a timer.
(Yasuhiro Matsumoto)
Solution: Block garbage collection when executing a timer. Add
test_garbagecollect_soon(). Add "no_wait_return" to
test_override(). (closes #4571)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 22 Jun 2019 01:45:05 +0200 |
| parents | d03a52e02f1a |
| children | cee12488e4bc |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -448,6 +448,7 @@ static void f_test_option_not_set(typval static void f_test_override(typval_T *argvars, typval_T *rettv); static void f_test_refcount(typval_T *argvars, typval_T *rettv); static void f_test_garbagecollect_now(typval_T *argvars, typval_T *rettv); +static void f_test_garbagecollect_soon(typval_T *argvars, typval_T *rettv); static void f_test_ignore_error(typval_T *argvars, typval_T *rettv); static void f_test_null_blob(typval_T *argvars, typval_T *rettv); #ifdef FEAT_JOB_CHANNEL @@ -1019,6 +1020,7 @@ static struct fst {"test_autochdir", 0, 0, f_test_autochdir}, {"test_feedinput", 1, 1, f_test_feedinput}, {"test_garbagecollect_now", 0, 0, f_test_garbagecollect_now}, + {"test_garbagecollect_soon", 0, 0, f_test_garbagecollect_soon}, {"test_getvalue", 1, 1, f_test_getvalue}, {"test_ignore_error", 1, 1, f_test_ignore_error}, {"test_null_blob", 0, 0, f_test_null_blob}, @@ -14460,6 +14462,8 @@ f_test_override(typval_T *argvars, typva nfa_fail_for_testing = val; else if (STRCMP(name, (char_u *)"no_query_mouse") == 0) no_query_mouse_for_testing = val; + else if (STRCMP(name, (char_u *)"no_wait_return") == 0) + no_wait_return = val; else if (STRCMP(name, (char_u *)"ALL") == 0) { disable_char_avail_for_testing = FALSE; @@ -14551,6 +14555,15 @@ f_test_garbagecollect_now(typval_T *argv } /* + * "test_garbagecollect_soon()" function + */ + static void +f_test_garbagecollect_soon(typval_T *argvars UNUSED, typval_T *rettv UNUSED) +{ + may_garbage_collect = TRUE; +} + +/* * "test_ignore_error()" function */ static void