Skip to content

Commit df9e907

Browse files
committed
mingw: work around incorrect standard handles
For some reason, when being called via TortoiseGit the standard handles, or at least what is returned by _get_osfhandle(0) for standard input, can take on the value (HANDLE)-2 (which is not a legal value, according to the documentation). Even if this value is not documented anywhere, CreateProcess() seems to work fine without complaints if hStdInput set to this value. In contrast, the upcoming code to restrict which file handles get inherited by spawned processes would result in `ERROR_INVALID_PARAMETER` when including such handle values in the list. To help this, special-case the value (HANDLE)-2 returned by _get_osfhandle() and replace it with INVALID_HANDLE_VALUE, which will hopefully let the handle inheritance restriction work even when called from TortoiseGit. This fixes #1481 Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 415dd69 commit df9e907

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

compat/winansi.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,10 +651,20 @@ void winansi_init(void)
651651
*/
652652
HANDLE winansi_get_osfhandle(int fd)
653653
{
654+
HANDLE ret;
655+
654656
if (fd == 1 && (fd_is_interactive[1] & FD_SWAPPED))
655657
return hconsole1;
656658
if (fd == 2 && (fd_is_interactive[2] & FD_SWAPPED))
657659
return hconsole2;
658660

659-
return (HANDLE)_get_osfhandle(fd);
661+
ret = (HANDLE)_get_osfhandle(fd);
662+
663+
/*
664+
* There are obviously circumstances under which _get_osfhandle()
665+
* returns (HANDLE)-2. This is not documented anywhere, but that is so
666+
* clearly an invalid handle value that we can just work around this
667+
* and return the correct value for invalid handles.
668+
*/
669+
return ret == (HANDLE)-2 ? INVALID_HANDLE_VALUE : ret;
660670
}

0 commit comments

Comments
 (0)