From 9772025d24e939fd84b85748ce35c26874c05775 Mon Sep 17 00:00:00 2001 From: Yegappan Lakshmanan Date: Fri, 23 May 2025 17:39:44 +0200 Subject: [PATCH] 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 Signed-off-by: Christian Brabandt --- src/testdir/test_tuple.vim | 11 +++++++++++ src/tuple.c | 3 +++ src/version.c | 2 ++ 3 files changed, 16 insertions(+) diff --git a/src/testdir/test_tuple.vim b/src/testdir/test_tuple.vim index e767851af2..45f730d86b 100644 --- a/src/testdir/test_tuple.vim +++ b/src/testdir/test_tuple.vim @@ -1586,6 +1586,17 @@ func Test_recursive_tuple_eval_fails() \ '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 eff4bdccc4..9ca1f34092 100644 --- a/src/tuple.c +++ b/src/tuple.c @@ -518,6 +518,9 @@ eval_tuple(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int do_error) // 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 c45c65e7b7..b9af08a7de 100644 --- a/src/version.c +++ b/src/version.c @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1406, /**/ 1405, /**/