patch 9.1.1406: crash when importing invalid tuple
Problem: crash when importing invalid tuple
(Yang LUO, Yanju Chen)
Solution: set type to VAR_UNKNOWN, so that it isn't freed
(Yegappan Lakshmanan)
closes: #17362
Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/testdir/test_tuple.vim b/src/testdir/test_tuple.vim
index e767851..45f730d 100644
--- a/src/testdir/test_tuple.vim
+++ b/src/testdir/test_tuple.vim
@@ -1586,6 +1586,17 @@
\ 'E121: Undefined variable: pat'])
endfunc
+" The following used to crash Vim
+func Test_import_invalid_tuple()
+ let lines =<< trim END
+ imp(",G0}11*f [+\x","#|
+ END
+ new
+ call setline(1, lines)
+ call assert_fails('source', 'E114: Missing double quote: "#|')
+ bw!
+endfunc
+
" Test for add() with a tuple
func Test_tuple_add()
let lines =<< trim END
diff --git a/src/tuple.c b/src/tuple.c
index eff4bdc..9ca1f34 100644
--- a/src/tuple.c
+++ b/src/tuple.c
@@ -518,6 +518,9 @@
// Add the first item to the tuple from "rettv"
if (tuple_append_tv(tuple, rettv) == FAIL)
return FAIL;
+ // The first item in "rettv" is added to the tuple. Set the rettv
+ // type to unknown, so that the caller doesn't free it.
+ rettv->v_type = VAR_UNKNOWN;
}
}
diff --git a/src/version.c b/src/version.c
index c45c65e..b9af08a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1406,
+/**/
1405,
/**/
1404,