Skip to content

Commit c5139e0

Browse files
committed
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
2 parents d7dcd52 + c46458e commit c5139e0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

compat/winansi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ static void detect_msys_tty(int fd)
556556
buffer, sizeof(buffer) - 2, &result)))
557557
return;
558558
name = nameinfo->Name.Buffer;
559-
name[nameinfo->Name.Length] = 0;
559+
name[nameinfo->Name.Length / sizeof(*name)] = 0;
560560

561561
/* check if this could be a MSYS2 pty pipe ('msys-XXXX-ptyN-XX') */
562562
if (!wcsstr(name, L"msys-") || !wcsstr(name, L"-pty"))

0 commit comments

Comments
 (0)