Skip to content

Commit

Permalink
mingw: work around incorrect standard handles
Browse files Browse the repository at this point in the history
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() works
without complaints if hStdInput set to this value.

In contrast, when our new code to restrict which file handles get
inherited by spawned processes apparently uses such a value in its
handle list, it does *not* work, erroring out with
`ERROR_INVALID_PARAMETER`.

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 addresses git-for-windows#1481

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Feb 7, 2018
1 parent fdd80a8 commit 9cb5307
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion compat/winansi.c
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,8 @@ void winansi_init(void)
*/
HANDLE winansi_get_osfhandle(int fd)
{
HANDLE ret;

if (debug_1481)
warning("get_osf_handle for %d (fd_is_interactive %x %x): "
"%p (%p %p)",
Expand All @@ -672,5 +674,13 @@ HANDLE winansi_get_osfhandle(int fd)
if (fd == 2 && (fd_is_interactive[2] & FD_SWAPPED))
return hconsole2;

return (HANDLE)_get_osfhandle(fd);
ret = (HANDLE)_get_osfhandle(fd);

/*
* There are obviously circumstances under which _get_osfhandle()
* returns (HANDLE)-2. This is not documented anywhere, but that is so
* clearly an invalid handle value that we can just work around this
* and return the correct value for invalid handles.
*/
return ret == (HANDLE)-2 ? INVALID_HANDLE_VALUE : ret;
}

0 comments on commit 9cb5307

Please sign in to comment.