thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2787: MS-Windows: crash when using :echoconsole

Browse Source 
Problem:    MS-Windows: crash when using :echoconsole.
Solution:   Do not write a NUL when it's already there.
This commit is contained in:
Bram Moolenaar
2021-04-20 10:33:28 +02:00
parent 4f2df37a0d
commit 6d4c1c7ba8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/os_win32.c
View File

@@ -6411,7 +6411,9 @@ mch_write(
return; return;
# endif # endif
s[len] = NUL; // Avoid writing to a string literal.
if (s[len] != NUL)
s[len] = NUL;
if (!term_console) if (!term_console)
{ {
@@ -6433,7 +6435,7 @@ mch_write(
return; return;
} }
while((ch = s[++prefix])) while ((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;

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 */
/**/
2787,
/**/ /**/
2786, 2786,
/**/ /**/