aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-08-22 19:27:53 -04:00
Code

patch 8.2.2793: MS-Windows: string literals are writable with MSVC

Browse Source 
Problem:    MS-Windows: string literals are writable with MSVC.
Solution:   Add the /GF compiler flag.  Make mch_write() safer. (Ken Takata,
            closes #8133)
This commit is contained in:
Bram Moolenaar 2021-04-21 11:30:48 +02:00
parent 9ce47ec0b6
commit d23f8bde5c
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Make_mvc.mak
View File

@ -489,7 +489,7 @@ CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib
#VIMRCLOC = somewhere #VIMRCLOC = somewhere
#VIMRUNTIMEDIR = somewhere #VIMRUNTIMEDIR = somewhere
CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \ CFLAGS = -c /W3 /GF /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \
$(CSCOPE_DEFS) $(TERM_DEFS) $(SOUND_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \ $(CSCOPE_DEFS) $(TERM_DEFS) $(SOUND_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \
$(NBDEBUG_DEFS) $(XPM_DEFS) \ $(NBDEBUG_DEFS) $(XPM_DEFS) \
$(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) $(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER)

11
src/os_win32.c
View File

@ -6406,15 +6406,13 @@ mch_write(
char_u *s, char_u *s,
int len) int len)
{ {
char_u *end = s + len;
# ifdef VIMDLL # ifdef VIMDLL
if (gui.in_use) if (gui.in_use)
return; return;
# endif # endif
// Avoid writing to a string literal.
if (s[len] != NUL)
s[len] = NUL;
if (!term_console) if (!term_console)
{ {
write(1, s, (unsigned)len); write(1, s, (unsigned)len);
@ -6435,10 +6433,13 @@ mch_write(
return; return;
} }
while ((ch = s[++prefix])) while (s + ++prefix < end)
{
ch = s[prefix];
if (ch <= 0x1e && !(ch != '\n' && ch != '\r' && ch != '\b' if (ch <= 0x1e && !(ch != '\n' && ch != '\r' && ch != '\b'
&& ch != '\a' && ch != '\033')) && ch != '\a' && ch != '\033'))
break; break;
}
if (p_wd) if (p_wd)
{ {

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2793,
/**/ /**/
2792, 2792,
/**/ /**/