Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > Hi Max, > > On Mon, 19 Dec 2016, Max Kirillov wrote: > >> UNICODE_STRING::Length field means size of buffer in bytes[1], despite >> of buffer itself being array of wchar_t. Because of that terminating >> zero is placed twice as far. Fix it. > > This commit message needs to be wrapped at <= 76 columns per row. > ... > Very good, thank you for fixing my mistake! I verified locally that it > does exactly the right thing with your patch. Thanks, both. I'll queue this like so. -- >8 -- From: Max Kirillov <max@xxxxxxxxxx> Date: Mon, 19 Dec 2016 23:32:00 +0200 Subject: [PATCH] mingw: consider that UNICODE_STRING::Length counts bytes UNICODE_STRING::Length field means size of buffer in bytes[1], despite of buffer itself being array of wchar_t. Because of that terminating zero is placed twice as far. Fix it. [1] https://msdn.microsoft.com/en-us/library/windows/desktop/aa380518.aspx Signed-off-by: Max Kirillov <max@xxxxxxxxxx> Acked-by: Johannes Schindelin <johannes.schindelin@xxxxxx> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- compat/winansi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/winansi.c b/compat/winansi.c index 3be60ce1c6..6b4f736fdc 100644 --- a/compat/winansi.c +++ b/compat/winansi.c @@ -553,7 +553,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")) base-commit: f7f90e0f4f58d493242078d17c0eba41dd3f1f79 -- 2.11.0-416-g1351c11cce