Mercurial > vim
view src/os_dos.h @ 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 | 695b50472e85 |
| children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * VIM - Vi IMproved by Bram Moolenaar * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. */ /* * Common MS-DOS and Win32 (Windows NT and Windows 95) defines. * * Names for the EXRC, HELP and temporary files. * Some of these may have been defined in the makefile or feature.h. */ #ifndef SYS_VIMRC_FILE # define SYS_VIMRC_FILE "$VIM\\vimrc" #endif #ifndef USR_VIMRC_FILE # define USR_VIMRC_FILE "$HOME\\_vimrc" #endif #ifndef USR_VIMRC_FILE2 # define USR_VIMRC_FILE2 "$HOME\\vimfiles\\vimrc" #endif #ifndef USR_VIMRC_FILE3 # define USR_VIMRC_FILE3 "$VIM\\_vimrc" #endif #ifndef VIM_DEFAULTS_FILE # define VIM_DEFAULTS_FILE "$VIMRUNTIME\\defaults.vim" #endif #ifndef EVIM_FILE # define EVIM_FILE "$VIMRUNTIME\\evim.vim" #endif #ifndef USR_EXRC_FILE # define USR_EXRC_FILE "$HOME\\_exrc" #endif #ifndef USR_EXRC_FILE2 # define USR_EXRC_FILE2 "$VIM\\_exrc" #endif #ifdef FEAT_GUI # ifndef SYS_GVIMRC_FILE # define SYS_GVIMRC_FILE "$VIM\\gvimrc" # endif # ifndef USR_GVIMRC_FILE # define USR_GVIMRC_FILE "$HOME\\_gvimrc" # endif # ifndef USR_GVIMRC_FILE2 # define USR_GVIMRC_FILE2 "$HOME\\vimfiles\\gvimrc" # endif # ifndef USR_GVIMRC_FILE3 # define USR_GVIMRC_FILE3 "$VIM\\_gvimrc" # endif # ifndef SYS_MENU_FILE # define SYS_MENU_FILE "$VIMRUNTIME\\menu.vim" # endif #endif #ifndef SYS_OPTWIN_FILE # define SYS_OPTWIN_FILE "$VIMRUNTIME\\optwin.vim" #endif #ifdef FEAT_VIMINFO # ifndef VIMINFO_FILE # define VIMINFO_FILE "$HOME\\_viminfo" # endif # ifndef VIMINFO_FILE2 # define VIMINFO_FILE2 "$VIM\\_viminfo" # endif #endif #ifndef VIMRC_FILE # define VIMRC_FILE "_vimrc" #endif #ifndef EXRC_FILE # define EXRC_FILE "_exrc" #endif #ifdef FEAT_GUI # ifndef GVIMRC_FILE # define GVIMRC_FILE "_gvimrc" # endif #endif #ifndef DFLT_HELPFILE # define DFLT_HELPFILE "$VIMRUNTIME\\doc\\help.txt" #endif #ifndef SYNTAX_FNAME # define SYNTAX_FNAME "$VIMRUNTIME\\syntax\\%s.vim" #endif #ifndef DFLT_BDIR # define DFLT_BDIR ".,$TEMP,c:\\tmp,c:\\temp" // default for 'backupdir' #endif #ifndef DFLT_VDIR # define DFLT_VDIR "$HOME/vimfiles/view" // default for 'viewdir' #endif #ifndef DFLT_DIR # define DFLT_DIR ".,$TEMP,c:\\tmp,c:\\temp" // default for 'directory' #endif #define DFLT_ERRORFILE "errors.err" #define DFLT_RUNTIMEPATH "$HOME/vimfiles,$VIM/vimfiles,$VIMRUNTIME,$HOME/vimfiles/after,$VIM/vimfiles/after" #define CLEAN_RUNTIMEPATH "$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after" #define CASE_INSENSITIVE_FILENAME // ignore case when comparing file names #define SPACE_IN_FILENAME #define BACKSLASH_IN_FILENAME #define USE_CRNL // lines end in CR-NL instead of NL #define HAVE_DUP // have dup() #define HAVE_ST_MODE // have stat.st_mode