updated for version 7.4.541

Problem:    Crash when doing a range assign.
Solution:   Check for NULL poiter. (Yukihiro Nakadaira)

diff --git a/src/eval.c b/src/eval.c
index 840e1e8f8249a709113505b0518ec3eeb3f41fa4..5c584dead59fa0424f54107ed4d497c80e308d43 100644 (file)
--- 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 140cb7c0e5ba1b27badc47f7b2858b35c47721f0..c4e82d429c443c133242a3294b0da5845f469b6f 100644 (file)
--- 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 e8560de4014e0845d55f4d98e74241a53f220d03..ba029b289804604d8da587974acedc4e6faecc3e 100644 (file)
--- 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 57b5d764211d749591d85247af1f9bdd8bd37a0c..451b837dc3415405566a4fc2bb092b0fb888ea7c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    541,
 /**/
     540,
 /**/