OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pex-win32.c (pex_win32_exec_child): Only close original file descriptors if child is launched successfully. 

2012-07-26  Kazu Hirata  <kazu@codesourcery.com>
	    Sandra Loosemore  <sandra@codesourcery.com>

	libiberty/
	* pex-win32.c (pex_win32_exec_child): Only close original file
	descriptors if child is launched successfully.

Co-Authored-By: Sandra Loosemore <sandra@codesourcery.com>

From-SVN: r189901
This commit is contained in:
Kazu Hirata 2012-07-26 23:18:47 +00:00 committed by Sandra Loosemore
parent 3984ea61cb
commit 9cd6dd8239
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libiberty/ChangeLog
View File

@ -1,3 +1,9 @@
2012-07-26 Kazu Hirata <kazu@codesourcery.com>
Sandra Loosemore <sandra@codesourcery.com>
* pex-win32.c (pex_win32_exec_child): Only close original file
descriptors if child is launched successfully.
2012-07-18 Jason Merrill <jason@redhat.com>
* cp-demangle.c (cplus_demangle_operators): Add *_cast.

25
libiberty/pex-win32.c
View File

@ -741,24 +741,17 @@ pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags,
int orig_out, orig_in, orig_err;
BOOL separate_stderr = !(flags & PEX_STDERR_TO_STDOUT);
/* Ensure we have inheritable descriptors to pass to the child, and close the
original descriptors. */
/* Ensure we have inheritable descriptors to pass to the child. */
orig_in = in;
in = _dup (orig_in);
if (orig_in != STDIN_FILENO)
_close (orig_in);
orig_out = out;
out = _dup (orig_out);
if (orig_out != STDOUT_FILENO)
_close (orig_out);
if (separate_stderr)
{
orig_err = errdes;
errdes = _dup (orig_err);
if (orig_err != STDERR_FILENO)
_close (orig_err);
}
stdin_handle = INVALID_HANDLE_VALUE;
@ -836,6 +829,22 @@ pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags,
*errmsg = "CreateProcess";
}
/* If the child was created successfully, close the original file
descriptors. If the process creation fails, these are closed by
pex_run_in_environment instead. We must not close them twice as
that seems to cause a Windows exception. */
if (pid != (pid_t) -1)
{
if (orig_in != STDIN_FILENO)
_close (orig_in);
if (orig_out != STDOUT_FILENO)
_close (orig_out);
if (separate_stderr
&& orig_err != STDERR_FILENO)
_close (orig_err);
}
/* Close the standard input, standard output and standard error handles
in the parent. */