Mercurial > vim
view src/GvimExt/Make_mvc.mak @ 34320:9d07f1036a69 v9.1.0094
patch 9.1.0094: xxd: buffer-overflow when writing color output
Commit: https://github.com/vim/vim/commit/00221487731ea1868c57259c7aa0eb713cd7ade7
Author: Goffredo Baroncelli <kreijack@inwind.it>
Date: Sat Feb 10 13:31:06 2024 +0100
patch 9.1.0094: xxd: buffer-overflow when writing color output
Problem: xxd: buffer-overflow when writing color output
Solution: properly account for the color escape sequences and
adjust LLEN macro
(Goffredo Baroncelli)
xxd: crash with higer number of column
xxd writes the data into a buffer before printing. Unfortunately
the buffer doesn't consider the space consumed by the escape
sequences used to change the color of the character.
BEFORE:
$ xxd -Ralways -c 256 /etc/passwd
Segmentation fault (core dumped)
AFTER:
$ ./xxd -Ralways -c 256 /etc/passwd
00000000: 726f 6f74 3a78 3a30 3a30 3a72 6f6f 743a 2f72 [...]
To solve this issue I had to increase the size of the buffer
considering for each byte of data 11 further characters for the
color escape sequence.
closes: #14003
Signed-off-by: Goffredo Baroncelli <kreijack@libero.it>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 10 Feb 2024 13:45:03 +0100 |
parents | 695b50472e85 |
children | f0000aa3acbc |
line wrap: on
line source
# Makefile for GvimExt, using MSVC # Options: # DEBUG=yes Build debug version (for VC7 and maybe later) # CPUARG= /arch:IA32/AVX/etc, call from main makefile to set # automatically from CPUNR # TARGETOS = WINNT !ifndef APPVER APPVER = 6.01 !endif # Set the default $(WINVER) to make it work with Windows 7. !ifndef WINVER WINVER = 0x0601 !endif !if "$(DEBUG)" != "yes" NODEBUG = 1 !endif !ifdef PROCESSOR_ARCHITECTURE # On Windows NT ! ifndef CPU CPU = i386 ! if !defined(PLATFORM) && defined(TARGET_CPU) PLATFORM = $(TARGET_CPU) ! endif ! ifdef PLATFORM ! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64") CPU = AMD64 ! elseif ("$(PLATFORM)" == "arm64") || ("$(PLATFORM)" == "ARM64") CPU = ARM64 ! elseif ("$(PLATFORM)" != "x86") && ("$(PLATFORM)" != "X86") ! error *** ERROR Unknown target platform "$(PLATFORM)". Make aborted. ! endif ! endif ! endif !else CPU = i386 !endif !ifdef SDK_INCLUDE_DIR ! include $(SDK_INCLUDE_DIR)\Win32.mak !elseif "$(USE_WIN32MAK)"=="yes" ! include <Win32.mak> !else cc = cl link = link rc = rc cflags = -nologo -c lflags = -incremental:no -nologo rcflags = /r olelibsdll = ole32.lib uuid.lib oleaut32.lib user32.lib gdi32.lib advapi32.lib !endif # include CPUARG cflags = $(cflags) $(CPUARG) # set WINVER and _WIN32_WINNT cflags = $(cflags) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) !if "$(CL)" == "/D_USING_V110_SDK71_" rcflags = $(rcflags) /D_USING_V110_SDK71_ !endif SUBSYSTEM = console !if "$(SUBSYSTEM_VER)" != "" SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER) !endif !if "$(CPU)" == "AMD64" || "$(CPU)" == "ARM64" OFFSET = 0x11C000000 !else OFFSET = 0x1C000000 !endif all: gvimext.dll gvimext.dll: gvimext.obj \ gvimext.res $(link) $(lflags) -dll -def:gvimext.def -base:$(OFFSET) -out:$*.dll $** $(olelibsdll) shell32.lib comctl32.lib -subsystem:$(SUBSYSTEM) if exist $*.dll.manifest mt -nologo -manifest $*.dll.manifest -outputresource:$*.dll;2 gvimext.obj: gvimext.h .cpp.obj: $(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp gvimext.res: gvimext.rc $(rc) /nologo $(rcflags) $(rcvars) gvimext.rc clean: - if exist gvimext.dll del gvimext.dll - if exist gvimext.lib del gvimext.lib - if exist gvimext.exp del gvimext.exp - if exist gvimext.obj del gvimext.obj - if exist gvimext.res del gvimext.res - if exist gvimext.dll.manifest del gvimext.dll.manifest