Mercurial > vim
view src/create_nvcmdidxs.vim @ 33815:08f9e1eac4cf v9.0.2123
patch 9.0.2123: Problem with initializing the length of range() lists
Commit: https://github.com/vim/vim/commit/df63da98d8dc284b1c76cfe1b17fa0acbd6094d8
Author: Christian Brabandt <cb@256bit.org>
Date: Thu Nov 23 20:14:28 2023 +0100
patch 9.0.2123: Problem with initializing the length of range() lists
Problem: Problem with initializing the length of range() lists
Solution: Set length explicitly when it shouldn't contain any items
range() may cause a wrong calculation of list length, which may later
then cause a segfault in list_find(). This is usually not a problem,
because range_list_materialize() calculates the length, when it
materializes the list.
In addition, in list_find() when the length of the range was wrongly
initialized, it may seem to be valid, so the check for list index
out-of-bounds will not be true, because it is called before the list is
actually materialized. And so we may eventually try to access a null
pointer, causing a segfault.
So this patch does 3 things:
- In f_range(), when we know that the list should be empty, explicitly
set the list->lv_len value to zero. This should happen, when
start is larger than end (in case the stride is positive) or
end is larger than start when the stride is negative.
This should fix the underlying issue properly. However,
- as a safety measure, let's check that the requested index is not
out of range one more time, after the list has been materialized
and return NULL in case it suddenly is.
- add a few more tests to verify the behaviour.
fixes: #13557
closes: #13563
Co-authored-by: Tim Pope <tpope@github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 23 Nov 2023 20:30:07 +0100 |
parents | ee1019e59bef |
children |
line wrap: on
line source
" This script generates the table nv_cmd_idx[] which contains the index in " nv_cmds[] table (normal.c) for each of the command character supported in " normal/visual mode. " This is used to speed up the command lookup in nv_cmds[]. " " Script should be run using "make nvcmdidxs", every time the nv_cmds[] table " in src/nv_cmds.h changes. " " This is written in legacy Vim script so that it can be run by a slightly " older Vim version. " Generate the table of normal/visual mode command characters and their " corresponding index. let cmd = 'create_nvcmdidxs' if has('unix') let cmd = './' .. cmd endif let nv_cmdtbl = systemlist(cmd)->map({i, ch -> {'idx': i, 'cmdchar': ch}}) " sort the table by the command character call sort(nv_cmdtbl, {a, b -> a.cmdchar - b.cmdchar}) " Compute the highest index upto which the command character can be directly " used as an index. let nv_max_linear = 0 for i in range(nv_cmdtbl->len()) if i != nv_cmdtbl[i].cmdchar let nv_max_linear = i - 1 break endif endfor " Generate a header file with the table let output =<< trim END /* * Automatically generated code by the create_nvcmdidxs.vim script. * * Table giving the index in nv_cmds[] to lookup based on * the command character. */ // nv_cmd_idx[<normal mode command character>] => nv_cmds[] index static const unsigned short nv_cmd_idx[] = { END " Add each command character in comment and the corresponding index let output += nv_cmdtbl->map({_, v -> \ printf(' /* %5d */ %3d,', v.cmdchar, v.idx)}) let output += ['};', '', \ '// The highest index for which', \ '// nv_cmds[idx].cmd_char == nv_cmd_idx[nv_cmds[idx].cmd_char]'] let output += ['static const int nv_max_linear = ' .. nv_max_linear .. ';'] call writefile(output, "nv_cmdidxs.h") quit " vim: shiftwidth=2 sts=2 expandtab