Mercurial > vim
changeset 29843:256418aa72ed v9.0.0260
patch 9.0.0260: using freed memory when using 'quickfixtextfunc' recursively
Commit: https://github.com/vim/vim/commit/d6c67629ed05aae436164eec474832daf8ba7420
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 24 20:07:22 2022 +0100
patch 9.0.0260: using freed memory when using 'quickfixtextfunc' recursively
Problem: Using freed memory when using 'quickfixtextfunc' recursively.
Solution: Do not allow for recursion.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 24 Aug 2022 21:15:03 +0200 |
| parents | 9679c317a980 |
| children | c16d053bd66b |
| files | src/quickfix.c src/testdir/test_quickfix.vim src/version.c |
| diffstat | 3 files changed, 24 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -4674,6 +4674,11 @@ call_qftf_func(qf_list_T *qfl, int qf_wi { callback_T *cb = &qftf_cb; list_T *qftf_list = NULL; + static int recursive = FALSE; + + if (recursive) + return NULL; // this doesn't work properly recursively + recursive = TRUE; // If 'quickfixtextfunc' is set, then use the user-supplied function to get // the text to display. Use the local value of 'quickfixtextfunc' if it is @@ -4688,7 +4693,10 @@ call_qftf_func(qf_list_T *qfl, int qf_wi // create the dict argument if ((d = dict_alloc_lock(VAR_FIXED)) == NULL) + { + recursive = FALSE; return NULL; + } dict_add_number(d, "quickfix", (long)IS_QF_LIST(qfl)); dict_add_number(d, "winid", (long)qf_winid); dict_add_number(d, "id", (long)qfl->qf_id); @@ -4711,6 +4719,7 @@ call_qftf_func(qf_list_T *qfl, int qf_wi dict_unref(d); } + recursive = FALSE; return qftf_list; }
--- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -6351,4 +6351,17 @@ func Test_qflist_statusmsg() %bw! endfunc +func Test_quickfixtextfunc_recursive() + func s:QFTfunc(o) + cgete '0' + endfunc + copen + let &quickfixtextfunc = 's:QFTfunc' + cex "" + + let &quickfixtextfunc = '' + cclose +endfunc + + " vim: shiftwidth=2 sts=2 expandtab