From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Dec 2016 08:11:44 +0000 (-0800)
Subject: Merge branch 'mk/mingw-winansi-ttyname-termination-fix'
X-Git-Tag: v2.12.0-rc0~99
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c5139e0e3811ea3f6014187e76b243ccf287cb83?hp=d7dcd52a42fc3d93c503da626fb669b3eee46ddc

Merge branch 'mk/mingw-winansi-ttyname-termination-fix'

A potential but unlikely buffer overflow in Windows port has been
fixed.

* mk/mingw-winansi-ttyname-termination-fix:
mingw: consider that UNICODE_STRING::Length counts bytes
---

diff --git a/compat/winansi.c b/compat/winansi.c
index cb725fb02f..97d84a96ed 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -556,7 +556,7 @@ static void detect_msys_tty(int fd)
 			buffer, sizeof(buffer) - 2, &result)))
 		return;
 	name = nameinfo->Name.Buffer;
-	name[nameinfo->Name.Length] = 0;
+	name[nameinfo->Name.Length / sizeof(*name)] = 0;
 
 	/* check if this could be a MSYS2 pty pipe ('msys-XXXX-ptyN-XX') */
 	if (!wcsstr(name, L"msys-") || !wcsstr(name, L"-pty"))