To: vim_dev@googlegroups.com Subject: Patch 8.2.3822 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3822 Problem: Leaking memory in map() and filter(), cannot use a string argument in Vim9 script. Solution: Fix the leak, adjust the argument check, also run the tests as Vim9 script. (Yegappan Lakshmanan, closes #9354) Files: src/errors.h, src/evalfunc.c, src/list.c, src/proto/typval.pro, src/testdir/test_filter_map.vim, src/testdir/test_vim9_builtin.vim, src/typval.c *** ../vim-8.2.3821/src/errors.h 2021-12-15 19:13:58.229251291 +0000 --- src/errors.h 2021-12-16 08:15:23.867849560 +0000 *************** *** 760,762 **** --- 760,764 ---- INIT(= N_("E1249: Highlight group name too long")); EXTERN char e_argument_of_str_must_be_list_string_dictionary_or_blob[] INIT(= N_("E1250: Argument of %s must be a List, String, Dictionary or Blob")); + EXTERN char e_list_dict_blob_or_string_required_for_argument_nr[] + INIT(= N_("E1228: List, Dictionary, Blob or String required for argument %d")); *** ../vim-8.2.3821/src/evalfunc.c 2021-12-13 13:11:00.692262343 +0000 --- src/evalfunc.c 2021-12-16 08:15:23.867849560 +0000 *************** *** 449,454 **** --- 449,470 ---- } /* + * Check "type" is a list of 'any' or a dict of 'any' or a blob or a string. + */ + static int + arg_list_or_dict_or_blob_or_string(type_T *type, argcontext_T *context) + { + if (type->tt_type == VAR_ANY + || type->tt_type == VAR_LIST + || type->tt_type == VAR_DICT + || type->tt_type == VAR_BLOB + || type->tt_type == VAR_STRING) + return OK; + arg_type_mismatch(&t_list_any, type, context->arg_idx + 1); + return FAIL; + } + + /* * Check "type" is a job. */ static int *************** *** 797,803 **** static argcheck_T arg1_len[] = {arg_len1}; static argcheck_T arg3_libcall[] = {arg_string, arg_string, arg_string_or_nr}; static argcheck_T arg14_maparg[] = {arg_string, arg_string, arg_bool, arg_bool}; ! static argcheck_T arg2_mapfilter[] = {arg_list_or_dict_or_blob, NULL}; static argcheck_T arg25_matchadd[] = {arg_string, arg_string, arg_number, arg_number, arg_dict_any}; static argcheck_T arg25_matchaddpos[] = {arg_string, arg_list_any, arg_number, arg_number, arg_dict_any}; static argcheck_T arg119_printf[] = {arg_string_or_nr, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; --- 813,819 ---- static argcheck_T arg1_len[] = {arg_len1}; static argcheck_T arg3_libcall[] = {arg_string, arg_string, arg_string_or_nr}; static argcheck_T arg14_maparg[] = {arg_string, arg_string, arg_bool, arg_bool}; ! static argcheck_T arg2_mapfilter[] = {arg_list_or_dict_or_blob_or_string, NULL}; static argcheck_T arg25_matchadd[] = {arg_string, arg_string, arg_number, arg_number, arg_dict_any}; static argcheck_T arg25_matchaddpos[] = {arg_string, arg_list_any, arg_number, arg_number, arg_dict_any}; static argcheck_T arg119_printf[] = {arg_string_or_nr, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; *** ../vim-8.2.3821/src/list.c 2021-12-15 19:13:58.233251285 +0000 --- src/list.c 2021-12-16 08:15:23.867849560 +0000 *************** *** 2281,2291 **** garray_T type_list; // map() and filter() return the first argument, also on failure. ! if (filtermap != FILTERMAP_MAPNEW) copy_tv(&argvars[0], rettv); if (in_vim9script() ! && (check_for_list_or_dict_or_blob_arg(argvars, 0) == FAIL)) return; if (filtermap == FILTERMAP_MAP && in_vim9script()) --- 2281,2292 ---- garray_T type_list; // map() and filter() return the first argument, also on failure. ! if (filtermap != FILTERMAP_MAPNEW && argvars[0].v_type != VAR_STRING) copy_tv(&argvars[0], rettv); if (in_vim9script() ! && (check_for_list_or_dict_or_blob_or_string_arg(argvars, 0) ! == FAIL)) return; if (filtermap == FILTERMAP_MAP && in_vim9script()) *** ../vim-8.2.3821/src/proto/typval.pro 2021-09-14 16:53:39.316540671 +0100 --- src/proto/typval.pro 2021-12-16 08:15:23.871849548 +0000 *************** *** 42,47 **** --- 42,48 ---- int check_for_list_or_blob_arg(typval_T *args, int idx); int check_for_list_or_dict_arg(typval_T *args, int idx); int check_for_list_or_dict_or_blob_arg(typval_T *args, int idx); + int check_for_list_or_dict_or_blob_or_string_arg(typval_T *args, int idx); int check_for_opt_buffer_or_dict_arg(typval_T *args, int idx); char_u *tv_get_string(typval_T *varp); char_u *tv_get_string_strict(typval_T *varp); *** ../vim-8.2.3821/src/testdir/test_filter_map.vim 2021-12-15 19:13:58.233251285 +0000 --- src/testdir/test_filter_map.vim 2021-12-16 08:15:23.871849548 +0000 *************** *** 1,5 **** --- 1,7 ---- " Test filter() and map() + source vim9.vim + " list with expression string func Test_filter_map_list_expr_string() " filter() *************** *** 143,210 **** call assert_equal(0z129956, bout) endfunc func Test_filter_map_string() - let s = "abc" - " filter() ! call filter(s, '"b" != v:val') ! call assert_equal(s, s) ! call assert_equal('ac', filter('abc', '"b" != v:val')) ! call assert_equal('あいうえお', filter('あxいxうxえxお', '"x" != v:val')) ! call assert_equal('あa😊💕💕b💕', filter('あxax😊x💕💕b💕x', '"x" != v:val')) ! call assert_equal('xxxx', filter('あxax😊x💕💕b💕x', '"x" == v:val')) ! let t = "%),:;>?]}’”†‡…‰,‱‼⁇⁈⁉℃℉,、。〉》」,』】〕〗〙〛,！），．：,；？,］｝" ! let u = "%):;>?]}’”†‡…‰‱‼⁇⁈⁉℃℉、。〉》」』】〕〗〙〛！），．：；？］｝" ! call assert_equal(u, filter(t, '"," != v:val')) ! call assert_equal('', filter('abc', '0')) ! call assert_equal('ac', filter('abc', { i, x -> "b" != x })) ! call assert_equal('あいうえお', filter('あxいxうxえxお', { i, x -> "x" != x })) ! call assert_equal('', filter('abc', { i, x -> v:false })) " map() ! call map(s, 'nr2char(char2nr(v:val) + 2)') ! call assert_equal(s, s) ! call assert_equal('cde', map('abc', 'nr2char(char2nr(v:val) + 2)')) ! call assert_equal('[あ][i][う][え][お]', map('あiうえお', '"[" .. v:val .. "]"')) ! call assert_equal('[あ][a][😊][,][‱][‼][⁇][⁈][⁉][💕][b][💕][c][💕]', map('あa😊,‱‼⁇⁈⁉💕b💕c💕', '"[" .. v:val .. "]"')) ! call assert_equal('', map('abc', '""')) ! call assert_equal('cde', map('abc', { i, x -> nr2char(char2nr(x) + 2) })) ! call assert_equal('[あ][i][う][え][お]', map('あiうえお', { i, x -> '[' .. x .. ']' })) ! call assert_equal('', map('abc', { i, x -> '' })) " mapnew() ! call mapnew(s, 'nr2char(char2nr(v:val) + 2)') ! call assert_equal(s, s) ! call assert_equal('cde', mapnew('abc', 'nr2char(char2nr(v:val) + 2)')) ! call assert_equal('[あ][i][う][え][お]', mapnew('あiうえお', '"[" .. v:val .. "]"')) ! call assert_equal('[あ][a][😊][,][‱][‼][⁇][⁈][⁉][💕][b][💕][c][💕]', mapnew('あa😊,‱‼⁇⁈⁉💕b💕c💕', '"[" .. v:val .. "]"')) ! call assert_equal('', mapnew('abc', '""')) ! call assert_equal('cde', mapnew('abc', { i, x -> nr2char(char2nr(x) + 2) })) ! call assert_equal('[あ][i][う][え][お]', mapnew('あiうえお', { i, x -> '[' .. x .. ']' })) ! call assert_equal('', mapnew('abc', { i, x -> '' })) ! ! " map() and filter() ! call assert_equal('[あ][⁈][a][😊][⁉][💕][💕][b][💕]', map(filter('あx⁈ax😊x⁉💕💕b💕x', '"x" != v:val'), '"[" .. v:val .. "]"')) ! ! " patterns-composing(\Z) ! call assert_equal('ॠॠ', filter('ऊॠॡ,ऊॠॡ', {i,x -> x =~ '\Z' .. nr2char(0x0960) })) ! call assert_equal('àà', filter('càt,càt', {i,x -> x =~ '\Za' })) ! call assert_equal('ÅÅ', filter('Åström,Åström', {i,x -> x =~ '\Z' .. nr2char(0xc5) })) ! call assert_equal('öö', filter('Åström,Åström', {i,x -> x =~ '\Z' .. nr2char(0xf6) })) ! call assert_equal('ऊ@ॡ', map('ऊॠॡ', {i,x -> x =~ '\Z' .. nr2char(0x0960) ? '@' : x })) ! call assert_equal('c@t', map('càt', {i,x -> x =~ '\Za' ? '@' : x })) ! call assert_equal('@ström', map('Åström', {i,x -> x =~ '\Z' .. nr2char(0xc5) ? '@' : x })) ! call assert_equal('Åstr@m', map('Åström', {i,x -> x =~ '\Z' .. nr2char(0xf6) ? '@' : x })) ! ! " patterns-composing(\%C) ! call assert_equal('ॠॠ', filter('ऊॠॡ,ऊॠॡ', {i,x -> x =~ nr2char(0x0960) .. '\%C' })) ! call assert_equal('àà', filter('càt,càt', {i,x -> x =~ 'a' .. '\%C' })) ! call assert_equal('ÅÅ', filter('Åström,Åström', {i,x -> x =~ nr2char(0xc5) .. '\%C' })) ! call assert_equal('öö', filter('Åström,Åström', {i,x -> x =~ nr2char(0xf6) .. '\%C' })) ! call assert_equal('ऊ@ॡ', map('ऊॠॡ', {i,x -> x =~ nr2char(0x0960) .. '\%C' ? '@' : x })) ! call assert_equal('c@t', map('càt', {i,x -> x =~ 'a' .. '\%C' ? '@' : x })) ! call assert_equal('@ström', map('Åström', {i,x -> x =~ nr2char(0xc5) .. '\%C' ? '@' : x })) ! call assert_equal('Åstr@m', map('Åström', {i,x -> x =~ nr2char(0xf6) .. '\%C' ? '@' : x })) endfunc " vim: shiftwidth=2 sts=2 expandtab --- 145,232 ---- call assert_equal(0z129956, bout) endfunc + " Test for using map(), filter() and mapnew() with a string func Test_filter_map_string() " filter() ! let lines =<< trim END ! VAR s = "abc" ! call filter(s, '"b" != v:val') ! call assert_equal(s, s) ! call assert_equal('ac', filter('abc', '"b" != v:val')) ! call assert_equal('あいうえお', filter('あxいxうxえxお', '"x" != v:val')) ! call assert_equal('あa😊💕💕b💕', filter('あxax😊x💕💕b💕x', '"x" != v:val')) ! call assert_equal('xxxx', filter('あxax😊x💕💕b💕x', '"x" == v:val')) ! VAR t = "%),:;>?]}’”†‡…‰,‱‼⁇⁈⁉℃℉,、。〉》」,』】〕〗〙〛,！），．：,；？,］｝" ! VAR u = "%):;>?]}’”†‡…‰‱‼⁇⁈⁉℃℉、。〉》」』】〕〗〙〛！），．：；？］｝" ! call assert_equal(u, filter(t, '"," != v:val')) ! call assert_equal('', filter('abc', '0')) ! call assert_equal('ac', filter('abc', LSTART i, x LMIDDLE "b" != x LEND)) ! call assert_equal('あいうえお', filter('あxいxうxえxお', LSTART i, x LMIDDLE "x" != x LEND)) ! call assert_equal('', filter('abc', LSTART i, x LMIDDLE v:false LEND)) ! call assert_equal('', filter('', "v:val == 'a'")) ! call assert_equal('', filter(test_null_string(), "v:val == 'a'")) ! END ! call CheckLegacyAndVim9Success(lines) " map() ! let lines =<< trim END ! VAR s = "abc" ! call map(s, 'nr2char(char2nr(v:val) + 2)') ! call assert_equal(s, s) ! call assert_equal('cde', map('abc', 'nr2char(char2nr(v:val) + 2)')) ! call assert_equal('[あ][i][う][え][お]', map('あiうえお', '"[" .. v:val .. "]"')) ! call assert_equal('[あ][a][😊][,][‱][‼][⁇][⁈][⁉][💕][b][💕][c][💕]', map('あa😊,‱‼⁇⁈⁉💕b💕c💕', '"[" .. v:val .. "]"')) ! call assert_equal('', map('abc', '""')) ! call assert_equal('cde', map('abc', LSTART i, x LMIDDLE nr2char(char2nr(x) + 2) LEND)) ! call assert_equal('[あ][i][う][え][お]', map('あiうえお', LSTART i, x LMIDDLE '[' .. x .. ']' LEND)) ! call assert_equal('', map('abc', LSTART i, x LMIDDLE '' LEND)) ! call assert_equal('', map('', "v:val == 'a'")) ! call assert_equal('', map(test_null_string(), "v:val == 'a'")) ! END ! call CheckLegacyAndVim9Success(lines) " mapnew() ! let lines =<< trim END ! VAR s = "abc" ! call mapnew(s, 'nr2char(char2nr(v:val) + 2)') ! call assert_equal(s, s) ! call assert_equal('cde', mapnew('abc', 'nr2char(char2nr(v:val) + 2)')) ! call assert_equal('[あ][i][う][え][お]', mapnew('あiうえお', '"[" .. v:val .. "]"')) ! call assert_equal('[あ][a][😊][,][‱][‼][⁇][⁈][⁉][💕][b][💕][c][💕]', mapnew('あa😊,‱‼⁇⁈⁉💕b💕c💕', '"[" .. v:val .. "]"')) ! call assert_equal('', mapnew('abc', '""')) ! call assert_equal('cde', mapnew('abc', LSTART i, x LMIDDLE nr2char(char2nr(x) + 2) LEND)) ! call assert_equal('[あ][i][う][え][お]', mapnew('あiうえお', LSTART i, x LMIDDLE '[' .. x .. ']' LEND)) ! call assert_equal('', mapnew('abc', LSTART i, x LMIDDLE '' LEND)) ! call assert_equal('', mapnew('', "v:val == 'a'")) ! call assert_equal('', mapnew(test_null_string(), "v:val == 'a'")) ! END ! call CheckLegacyAndVim9Success(lines) ! ! let lines =<< trim END ! #" map() and filter() ! call assert_equal('[あ][⁈][a][😊][⁉][💕][💕][b][💕]', map(filter('あx⁈ax😊x⁉💕💕b💕x', '"x" != v:val'), '"[" .. v:val .. "]"')) ! ! #" patterns-composing(\Z) ! call assert_equal('ॠॠ', filter('ऊॠॡ,ऊॠॡ', LSTART i, x LMIDDLE x =~ '\Z' .. nr2char(0x0960) LEND)) ! call assert_equal('àà', filter('càt,càt', LSTART i, x LMIDDLE x =~ '\Za' LEND)) ! call assert_equal('ÅÅ', filter('Åström,Åström', LSTART i, x LMIDDLE x =~ '\Z' .. nr2char(0xc5) LEND)) ! call assert_equal('öö', filter('Åström,Åström', LSTART i, x LMIDDLE x =~ '\Z' .. nr2char(0xf6) LEND)) ! call assert_equal('ऊ@ॡ', map('ऊॠॡ', LSTART i, x LMIDDLE x =~ '\Z' .. nr2char(0x0960) ? '@' : x LEND)) ! call assert_equal('c@t', map('càt', LSTART i, x LMIDDLE x =~ '\Za' ? '@' : x LEND)) ! call assert_equal('@ström', map('Åström', LSTART i, x LMIDDLE x =~ '\Z' .. nr2char(0xc5) ? '@' : x LEND)) ! call assert_equal('Åstr@m', map('Åström', LSTART i, x LMIDDLE x =~ '\Z' .. nr2char(0xf6) ? '@' : x LEND)) ! ! #" patterns-composing(\%C) ! call assert_equal('ॠॠ', filter('ऊॠॡ,ऊॠॡ', LSTART i, x LMIDDLE x =~ nr2char(0x0960) .. '\%C' LEND)) ! call assert_equal('àà', filter('càt,càt', LSTART i, x LMIDDLE x =~ 'a' .. '\%C' LEND)) ! call assert_equal('ÅÅ', filter('Åström,Åström', LSTART i, x LMIDDLE x =~ nr2char(0xc5) .. '\%C' LEND)) ! call assert_equal('öö', filter('Åström,Åström', LSTART i, x LMIDDLE x =~ nr2char(0xf6) .. '\%C' LEND)) ! call assert_equal('ऊ@ॡ', map('ऊॠॡ', LSTART i, x LMIDDLE x =~ nr2char(0x0960) .. '\%C' ? '@' : x LEND)) ! call assert_equal('c@t', map('càt', LSTART i, x LMIDDLE x =~ 'a' .. '\%C' ? '@' : x LEND)) ! call assert_equal('@ström', map('Åström', LSTART i, x LMIDDLE x =~ nr2char(0xc5) .. '\%C' ? '@' : x LEND)) ! call assert_equal('Åstr@m', map('Åström', LSTART i, x LMIDDLE x =~ nr2char(0xf6) .. '\%C' ? '@' : x LEND)) ! END ! call CheckLegacyAndVim9Success(lines) endfunc " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.3821/src/testdir/test_vim9_builtin.vim 2021-12-01 12:41:25.079773508 +0000 --- src/testdir/test_vim9_builtin.vim 2021-12-16 08:15:23.871849548 +0000 *************** *** 1232,1238 **** enddef def Test_filter() ! CheckDefAndScriptFailure2(['filter(1.1, "1")'], 'E1013: Argument 1: type mismatch, expected list but got float', 'E1228: List, Dictionary or Blob required for argument 1') assert_equal([], filter([1, 2, 3], '0')) assert_equal([1, 2, 3], filter([1, 2, 3], '1')) assert_equal({b: 20}, filter({a: 10, b: 20}, 'v:val == 20')) --- 1232,1238 ---- enddef def Test_filter() ! CheckDefAndScriptFailure2(['filter(1.1, "1")'], 'E1013: Argument 1: type mismatch, expected list but got float', 'E1228: List, Dictionary, Blob or String required for argument 1') assert_equal([], filter([1, 2, 3], '0')) assert_equal([1, 2, 3], filter([1, 2, 3], '1')) assert_equal({b: 20}, filter({a: 10, b: 20}, 'v:val == 20')) *************** *** 2027,2034 **** enddef def Test_map() ! CheckDefAndScriptFailure2(['map("x", "1")'], 'E1013: Argument 1: type mismatch, expected list but got string', 'E1228: List, Dictionary or Blob required for argument 1') ! CheckDefAndScriptFailure2(['map(1, "1")'], 'E1013: Argument 1: type mismatch, expected list but got number', 'E1228: List, Dictionary or Blob required for argument 1') enddef def Test_map_failure() --- 2027,2034 ---- enddef def Test_map() ! CheckDefAndScriptFailure2(['map(test_null_channel(), "1")'], 'E1013: Argument 1: type mismatch, expected list but got channel', 'E1228: List, Dictionary, Blob or String required for argument 1') ! CheckDefAndScriptFailure2(['map(1, "1")'], 'E1013: Argument 1: type mismatch, expected list but got number', 'E1228: List, Dictionary, Blob or String required for argument 1') enddef def Test_map_failure() *************** *** 2144,2151 **** enddef def Test_mapnew() ! CheckDefAndScriptFailure2(['mapnew("x", "1")'], 'E1013: Argument 1: type mismatch, expected list but got string', 'E1228: List, Dictionary or Blob required for argument 1') ! CheckDefAndScriptFailure2(['mapnew(1, "1")'], 'E1013: Argument 1: type mismatch, expected list but got number', 'E1228: List, Dictionary or Blob required for argument 1') enddef def Test_mapset() --- 2144,2151 ---- enddef def Test_mapnew() ! CheckDefAndScriptFailure2(['mapnew(test_null_job(), "1")'], 'E1013: Argument 1: type mismatch, expected list but got job', 'E1228: List, Dictionary, Blob or String required for argument 1') ! CheckDefAndScriptFailure2(['mapnew(1, "1")'], 'E1013: Argument 1: type mismatch, expected list but got number', 'E1228: List, Dictionary, Blob or String required for argument 1') enddef def Test_mapset() *** ../vim-8.2.3821/src/typval.c 2021-12-06 11:03:50.950900210 +0000 --- src/typval.c 2021-12-16 08:15:23.871849548 +0000 *************** *** 832,837 **** --- 832,859 ---- } /* + * Give an error and return FAIL unless "args[idx]" is a list or dict or a + * blob or a string. + */ + int + check_for_list_or_dict_or_blob_or_string_arg(typval_T *args, int idx) + { + if (args[idx].v_type != VAR_LIST + && args[idx].v_type != VAR_DICT + && args[idx].v_type != VAR_BLOB + && args[idx].v_type != VAR_STRING) + { + if (idx >= 0) + semsg(_(e_list_dict_blob_or_string_required_for_argument_nr), + idx + 1); + else + emsg(_(e_listreq)); + return FAIL; + } + return OK; + } + + /* * Give an error and return FAIL unless "args[idx]" is an optional buffer * number or a dict. */ *** ../vim-8.2.3821/src/version.c 2021-12-15 21:29:16.127709915 +0000 --- src/version.c 2021-12-16 08:17:42.015417853 +0000 *************** *** 751,752 **** --- 751,754 ---- { /* Add new patch number below this line */ + /**/ + 3822, /**/ -- Despite the cost of living, have you noticed how it remains so popular? /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///