diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-12-07 00:18:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-12-07 00:18:33 +0100 |
| commit | b2a851fee41a5a1faddcb862aef2beca69dc063a (patch) | |
| tree | 7e3a2c1ccec0d8864027e21bed928d6dc26d6ef6 | |
| parent | ed32d9424d12f93dcdb96f2a5c512f7ad9945bee (diff) | |
updated for version 7.4.541v7.4.541
Problem: Crash when doing a range assign.
Solution: Check for NULL poiter. (Yukihiro Nakadaira)
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/testdir/test55.in | 5 | ||||
| -rw-r--r-- | src/testdir/test55.ok | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 840e1e8f82..5c584dead5 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2951,7 +2951,7 @@ set_var_lval(lp, endp, rettv, copy, op) /* * Check whether any of the list items is locked */ - for (ri = rettv->vval.v_list->lv_first; ri != NULL; ) + for (ri = rettv->vval.v_list->lv_first; ri != NULL && ll_li != NULL; ) { if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name)) return; diff --git a/src/testdir/test55.in b/src/testdir/test55.in index 140cb7c0e5..c4e82d429c 100644 --- a/src/testdir/test55.in +++ b/src/testdir/test55.in @@ -401,6 +401,11 @@ let l = [0, 1, 2, 3] : $put =v:exception[:15] . v:exception[-1:-1] :endtry :$put =string(d) +:" +:" test for range assign +:let l = [0] +:let l[:] = [1, 2] +:$put =string(l) :endfun :" :call Test(1, 2, [3, 4], {5: 6}) " This may take a while diff --git a/src/testdir/test55.ok b/src/testdir/test55.ok index e8560de401..ba029b2898 100644 --- a/src/testdir/test55.ok +++ b/src/testdir/test55.ok @@ -129,6 +129,7 @@ caught a:000[3] {'a': {'b': 'B'}} Vim(call):E737: a {'a': {'b': 'B'}} +[1, 2] Vim(foldopen):E490: diff --git a/src/version.c b/src/version.c index 57b5d76421..451b837dc3 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 541, +/**/ 540, /**/ 539, |