patch 8.2.2793: MS-Windows: string literals are writable with MSVC
Problem: MS-Windows: string literals are writable with MSVC.
Solution: Add the /GF compiler flag. Make mch_write() safer. (Ken Takata,
closes #8133)
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 257f7e0..0f5611a 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -489,7 +489,7 @@
#VIMRCLOC = 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) \
$(NBDEBUG_DEFS) $(XPM_DEFS) \
$(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER)
diff --git a/src/os_win32.c b/src/os_win32.c
index 9b692ec..d40d033 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -6406,15 +6406,13 @@
char_u *s,
int len)
{
+ char_u *end = s + len;
+
# ifdef VIMDLL
if (gui.in_use)
return;
# endif
- // Avoid writing to a string literal.
- if (s[len] != NUL)
- s[len] = NUL;
-
if (!term_console)
{
write(1, s, (unsigned)len);
@@ -6435,10 +6433,13 @@
return;
}
- while ((ch = s[++prefix]))
+ while (s + ++prefix < end)
+ {
+ ch = s[prefix];
if (ch <= 0x1e && !(ch != '\n' && ch != '\r' && ch != '\b'
&& ch != '\a' && ch != '\033'))
break;
+ }
if (p_wd)
{
diff --git a/src/version.c b/src/version.c
index 01ec9a1..07a1e04 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2793,
+/**/
2792,
/**/
2791,