From 6d4c1c7ba816294408097d72717366a97781655d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 20 Apr 2021 10:33:28 +0200 Subject: [PATCH] patch 8.2.2787: MS-Windows: crash when using :echoconsole Problem: MS-Windows: crash when using :echoconsole. Solution: Do not write a NUL when it's already there. --- src/os_win32.c | 6 ++++-- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/os_win32.c b/src/os_win32.c index 7c2051f7f..9b692ec0e 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -6411,7 +6411,9 @@ mch_write( return; # endif - s[len] = NUL; + // Avoid writing to a string literal. + if (s[len] != NUL) + s[len] = NUL; if (!term_console) { @@ -6433,7 +6435,7 @@ mch_write( return; } - while((ch = s[++prefix])) + while ((ch = s[++prefix])) if (ch <= 0x1e && !(ch != '\n' && ch != '\r' && ch != '\b' && ch != '\a' && ch != '\033')) break; diff --git a/src/version.c b/src/version.c index 834196d83..54bf12761 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2787, /**/ 2786, /**/ -- 2.40.0