From: Johannes Schindelin Date: Thu, 04 May 2017 13:55:34 GMT Subject: [PATCH v4 03/25] winansi: avoid buffer overrun Message-ID: <06f1457a87c9b6b5b4619682c8601bda18e3ff2a.1493906085.git.johannes.schindelin@gmx.de> In-Reply-To: When we could not convert the UTF-8 sequence into Unicode for writing to the Console, we should not try to write an insanely-long sequence of invalid wide characters (mistaking the negative return value for an unsigned length). Reported by Coverity. Signed-off-by: Johannes Schindelin --- compat/winansi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compat/winansi.c b/compat/winansi.c index a551de90eb0..a11a0f16d27 100644 --- a/compat/winansi.c +++ b/compat/winansi.c @@ -140,6 +140,11 @@ static void write_console(unsigned char *str, size_t len) /* convert utf-8 to utf-16 */ int wlen = xutftowcsn(wbuf, (char*) str, ARRAY_SIZE(wbuf), len); + if (wlen < 0) { + wchar_t *err = L"[invalid]"; + WriteConsoleW(console, err, wcslen(err), &dummy, NULL); + return; + } /* write directly to console */ WriteConsoleW(console, wbuf, wlen, &dummy, NULL); -- 2.12.2.windows.2.800.gede8f145e06