Merge branch 'mk/mingw-winansi-ttyname-termination-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:03 +0000 (15:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:03 +0000 (15:19 -0800)
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

compat/winansi.c
index 477209fce7beedca3159a8140d2ac9e3a69400f3..3c9ed3cfe07c1f3b58f5400af861fb8ae44c3fdb 100644 (file)
@@ -540,7 +540,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')