aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2014-12-29 23:18:13 -0500
committerJustin M. Keyes <justinkz@gmail.com>2014-12-29 23:18:13 -0500
commit7285b0c8637505c7e464e4efb81df77f6cdcf02f (patch)
treeef9574b96d8558d590b0c8cfd03b4cfad0282710 /src/nvim/eval.c
parentb229908587928249f7ecc787615470c235dbfaf4 (diff)
parent4ad5b245f0eba86ea5091d9e344e136af6f4ebec (diff)
downloadrneovim-7285b0c8637505c7e464e4efb81df77f6cdcf02f.tar.gz
rneovim-7285b0c8637505c7e464e4efb81df77f6cdcf02f.tar.bz2
rneovim-7285b0c8637505c7e464e4efb81df77f6cdcf02f.zip
Merge pull request #1737 from fwalch/vim-7.4.541
vim-patch:7.4.541
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r--src/nvim/eval.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 116944b28d..97d778327b 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -2247,7 +2247,7 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv, int copy, ch
int ll_n1 = lp->ll_n1;
// Check whether any of the list items is locked
- for (listitem_T *ri = rettv->vval.v_list->lv_first; ri != NULL; ) {
+ for (listitem_T *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;
}