Mercurial > vim
view src/testdir/Make_ming.mak @ 33811:06219b3bdaf3 v9.0.2121
patch 9.0.2121: [security]: use-after-free in ex_substitute
Commit: https://github.com/vim/vim/commit/26c11c56888d01e298cd8044caf860f3c26f57bb
Author: Christian Brabandt <cb@256bit.org>
Date: Wed Nov 22 21:26:41 2023 +0100
patch 9.0.2121: [security]: use-after-free in ex_substitute
Problem: [security]: use-after-free in ex_substitute
Solution: always allocate memory
closes: #13552
A recursive :substitute command could cause a heap-use-after free in Vim
(CVE-2023-48706).
The whole reproducible test is a bit tricky, I can only reproduce this
reliably when no previous substitution command has been used yet
(which is the reason, the test needs to run as first one in the
test_substitute.vim file) and as a combination of the `:~` command
together with a :s command that contains the special substitution atom `~\=`
which will make use of a sub-replace special atom and calls a vim script
function.
There was a comment in the existing :s code, that already makes the
`sub` variable allocate memory so that a recursive :s call won't be able
to cause any issues here, so this was known as a potential problem
already. But for the current test-case that one does not work, because
the substitution does not start with `\=` but with `~\=` (and since
there does not yet exist a previous substitution atom, Vim will simply
increment the `sub` pointer (which then was not allocated dynamically)
and later one happily use a sub-replace special expression (which could
then free the `sub` var).
The following commit fixes this, by making the sub var always using
allocated memory, which also means we need to free the pointer whenever
we leave the function. Since sub is now always an allocated variable,
we also do no longer need the sub_copy variable anymore, since this one
was used to indicated when sub pointed to allocated memory (and had
therefore to be freed on exit) and when not.
Github Security Advisory:
https://github.com/vim/vim/security/advisories/GHSA-c8qm-x72m-q53q
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Wed, 22 Nov 2023 22:15:05 +0100 |
parents | 55aa44dd59ef |
children |
line wrap: on
line source
# # Makefile to run all tests for Vim, on Dos-like machines # with sh.exe or zsh.exe in the path or not. # # Author: Bill McCarthy # # Requires a set of Unix tools: echo, diff, etc. # Don't use unix-like shell. SHELL = cmd.exe DEL = del DELDIR = rd /s /q MV = move /y CP = copy /y CAT = type VIMPROG = ..\\vim default: nongui include Make_all.mak # Explicit dependencies. test_options.res test_alot.res: opt_test.vim TEST_OUTFILES = $(SCRIPTS_TINY_OUT) DOSTMP = dostmp # Keep $(DOSTMP)/*.in .PRECIOUS: $(patsubst %.out, $(DOSTMP)/%.in, $(TEST_OUTFILES)) .SUFFIXES: .in .out .res .vim # Add --gui-dialog-file to avoid getting stuck in a dialog. COMMON_ARGS = $(NO_INITS) --gui-dialog-file guidialog nongui: nolog tinytests newtests report gui: nolog tinytests newtests report tiny: nolog tinytests report benchmark: $(SCRIPTS_BENCH) report: @rem without the +eval feature test_result.log is a copy of test.log @if exist test.log ( copy /y test.log test_result.log > nul ) \ else ( echo No failures reported > test_result.log ) $(VIMPROG) -u NONE $(COMMON_ARGS) -S summarize.vim messages -if exist starttime del starttime @echo. @echo Test results: @cmd /c type test_result.log @if exist test.log ( echo TEST FAILURE & exit /b 1 ) \ else ( echo ALL DONE ) # Execute an individual new style test, e.g.: # mingw32-make -f Make_ming.mak test_largefile $(NEW_TESTS): -if exist $@.res del $@.res -if exist test.log del test.log -if exist messages del messages -if exist starttime del starttime @$(MAKE) -f Make_ming.mak $@.res VIMPROG=$(VIMPROG) --no-print-directory @type messages @if exist test.log exit 1 # Delete files that may interfere with running tests. This includes some files # that may result from working on the tests, not only from running them. clean: -@if exist *.out $(DEL) *.out -@if exist *.failed $(DEL) *.failed -@if exist *.res $(DEL) *.res -@if exist $(DOSTMP) rd /s /q $(DOSTMP) -@if exist test.in $(DEL) test.in -@if exist test.ok $(DEL) test.ok -@if exist Xdir1 $(DELDIR) Xdir1 -@if exist Xfind $(DELDIR) Xfind -@if exist XfakeHOME $(DELDIR) XfakeHOME -@if exist X* $(DEL) X* -@for /d %%i in (X*) do @rd /s/q %%i -@if exist viminfo $(DEL) viminfo -@if exist test.log $(DEL) test.log -@if exist test_result.log del test_result.log -@if exist messages $(DEL) messages -@if exist starttime $(DEL) starttime -@if exist benchmark.out del benchmark.out -@if exist opt_test.vim $(DEL) opt_test.vim -@if exist guidialog $(DEL) guidialog -@if exist guidialogfile $(DEL) guidialogfile nolog: -@if exist test.log $(DEL) test.log -@if exist test_result.log del test_result.log -@if exist messages $(DEL) messages -@if exist starttime $(DEL) starttime # Tiny tests. Works even without the +eval feature. tinytests: $(SCRIPTS_TINY_OUT) # Copy the input files to dostmp, changing the fileformat to dos. $(DOSTMP)/%.in : %.in if not exist $(DOSTMP)\nul mkdir $(DOSTMP) if exist $(DOSTMP)\$< $(DEL) $(DOSTMP)\$< $(VIMPROG) -u dos.vim $(COMMON_ARGS) "+set ff=dos|f $@|wq" $< # For each input file dostmp/test99.in run the tests. # This moves test99.in to test99.in.bak temporarily. %.out : $(DOSTMP)/%.in -@if exist test.out $(DEL) test.out -@if exist $(DOSTMP)\$@ $(DEL) $(DOSTMP)\$@ $(MV) $(notdir $<) $(notdir $<).bak > NUL $(CP) $(DOSTMP)\$(notdir $<) $(notdir $<) > NUL $(CP) $(basename $@).ok test.ok > NUL $(VIMPROG) -u dos.vim $(COMMON_ARGS) -s dotest.in $(notdir $<) -@if exist test.out $(MV) test.out $(DOSTMP)\$@ > NUL -@if exist $(notdir $<).bak $(MV) $(notdir $<).bak $(notdir $<) > NUL -@if exist test.ok $(DEL) test.ok -@if exist Xdir1 $(DELDIR) /s /q Xdir1 -@if exist Xfind $(DELDIR) Xfind -@if exist XfakeHOME $(DELDIR) XfakeHOME -@del X* -@if exist viminfo del viminfo $(VIMPROG) -u dos.vim $(COMMON_ARGS) "+set ff=unix|f test.out|wq" \ $(DOSTMP)\$@ @diff test.out $(basename $@).ok & if errorlevel 1 \ ( $(MV) test.out $(basename $@).failed > NUL \ & del $(DOSTMP)\$@ \ & echo $(basename $@) FAILED >> test.log ) \ else ( $(MV) test.out $(basename $@).out > NUL ) # New style of tests uses Vim script with assert calls. These are easier # to write and a lot easier to read and debug. # Limitation: Only works with the +eval feature. newtests: newtestssilent @if exist messages type messages newtestssilent: $(NEW_TESTS_RES) .vim.res: @echo $(VIMPROG) > vimcmd $(VIMPROG) -u NONE $(COMMON_ARGS) -S runtest.vim $*.vim @$(DEL) vimcmd test_gui.res: test_gui.vim @echo $(VIMPROG) > vimcmd $(VIMPROG) -u NONE $(COMMON_ARGS) -S runtest.vim $< @$(DEL) vimcmd test_gui_init.res: test_gui_init.vim @echo $(VIMPROG) > vimcmd $(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< @$(DEL) vimcmd opt_test.vim: ../optiondefs.h gen_opt_test.vim $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h test_bench_regexp.res: test_bench_regexp.vim -$(DEL) benchmark.out @echo $(VIMPROG) > vimcmd $(VIMPROG) -u NONE $(COMMON_ARGS) -S runtest.vim $*.vim @$(DEL) vimcmd $(CAT) benchmark.out