diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:44 -0800 |
| commit | c5139e0e3811ea3f6014187e76b243ccf287cb83 (patch) | |
| tree | fc7dbdc4d06dce74fd346cd873eb9ae80a68e28d | |
| parent | d7dcd52a42fc3d93c503da626fb669b3eee46ddc (diff) | |
| parent | c46458e82f0112ed288bcf89bea973b859e1854e (diff) | |
| download | git-c5139e0e3811ea3f6014187e76b243ccf287cb83.tar.gz | |
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
| -rw-r--r-- | compat/winansi.c | 2 |
1 files changed, 1 insertions, 1 deletions
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")) |