updated for version 7.3.005

Problem:    Crash when using undotree(). (Christian Brabandt)
Solution:   Increase the list reference count.  Add a test for undotree()
            (Lech Lorens)

diff --git a/src/eval.c b/src/eval.c
index fc01006f2ea39be16059221376e518b9c14954b7..0f306d46ffd6070deae9b4a60a62ae7683fe0e7f 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -7075,7 +7075,7 @@ dict_add_nr_str(d, key, nr, str)
 }
 
 /*
- * Add a list  entry to dictionary "d".
+ * Add a list entry to dictionary "d".
  * Returns FAIL when out of memory and when key already exists.
  */
     int
@@ -7097,6 +7097,7 @@ dict_add_list(d, key, list)
        dictitem_free(item);
        return FAIL;
     }
+    ++list->lv_refcount;
     return OK;
 }
 

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 4951dc2fa13a34506523a7547d536dac3e96faf9..bdc2c28cbddfd3fb9f677b745fba75a5c2f8d9a9 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -44,7 +44,7 @@ report:
 $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
 
 clean:
-       -rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.pid* viminfo
+       -rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.* viminfo
 
 test1.out: test1.in
        -rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* viminfo

diff --git a/src/testdir/test61.in b/src/testdir/test61.in
index f9a15746160fb9e7e006c266b1283fe4812d6e16..88831636ae375c63df32e8ad63825a7e60bf841c 100644 (file)
--- a/src/testdir/test61.in
+++ b/src/testdir/test61.in
@@ -3,6 +3,10 @@ Since this script is sourced we need to explicitly break changes up in
 undo-able pieces.  Do that by setting 'undolevels'.
 Also tests :earlier and :later.
 
+STARTTEST
+:echo undotree().entries
+ENDTEST
+
 STARTTEST
 :" Delete three characters and undo
 Gx:set ul=100

diff --git a/src/version.c b/src/version.c
index 3b50ffb95d336969c2bef17b529e02d819020f51..a1b3718c37afcc93e3f994fa076280644ada9ed2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5,
 /**/
     4,
 /**/