# HG changeset patch # User Christian Brabandt # Date 1462137305 -7200 # Node ID 0aa90b84118c4873f7e0563def7fa0418a5019c0 # Parent 37378cd98b8463e5197b35339f9f77a6a7b2e0cf commit https://github.com/vim/vim/commit/d8585eded6359f1d7e1981e96ae775efd077c638 Author: Bram Moolenaar Date: Sun May 1 23:05:53 2016 +0200 patch 7.4.1816 Problem: Looping over a null list throws an error. Solution: Skip over the for loop. diff --git a/src/eval.c b/src/eval.c --- a/src/eval.c +++ b/src/eval.c @@ -3292,11 +3292,16 @@ eval_for_line( if (!skip) { l = tv.vval.v_list; - if (tv.v_type != VAR_LIST || l == NULL) + if (tv.v_type != VAR_LIST) { EMSG(_(e_listreq)); clear_tv(&tv); } + else if (l == NULL) + { + /* a null list is like an empty list: do nothing */ + clear_tv(&tv); + } else { /* No need to increment the refcount, it's already set for the diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim --- a/src/testdir/test_expr.vim +++ b/src/testdir/test_expr.vim @@ -83,3 +83,10 @@ func Test_getreg_empty_list() call add(x, 'foo') call assert_equal(['foo'], y) endfunc + +func Test_loop_over_null_list() + let null_list = submatch(1, 1) + for i in null_list + call assert_true(0, 'should not get here') + endfor +endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1816, +/**/ 1815, /**/ 1814,