Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
171dab06
Commit
171dab06
authored
May 07, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel32: Reset stdio file descriptors when passed invalid handles.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
280d10b2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
13 deletions
+23
-13
process.c
dlls/kernel32/process.c
+23
-13
No files found.
dlls/kernel32/process.c
View file @
171dab06
...
...
@@ -2029,6 +2029,27 @@ static BOOL terminate_main_thread(void)
}
#endif
/***********************************************************************
* set_stdio_fd
*/
static
void
set_stdio_fd
(
int
stdin_fd
,
int
stdout_fd
)
{
int
fd
=
-
1
;
if
(
stdin_fd
==
-
1
||
stdout_fd
==
-
1
)
{
fd
=
open
(
"/dev/null"
,
O_RDWR
);
if
(
stdin_fd
==
-
1
)
stdin_fd
=
fd
;
if
(
stdout_fd
==
-
1
)
stdout_fd
=
fd
;
}
dup2
(
stdin_fd
,
0
);
dup2
(
stdout_fd
,
1
);
if
(
fd
!=
-
1
)
close
(
fd
);
}
/***********************************************************************
* spawn_loader
*/
...
...
@@ -2060,21 +2081,10 @@ static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, int socket
if
(
params
->
ConsoleFlags
||
params
->
ConsoleHandle
==
KERNEL32_CONSOLE_ALLOC
||
(
params
->
hStdInput
==
INVALID_HANDLE_VALUE
&&
params
->
hStdOutput
==
INVALID_HANDLE_VALUE
))
{
int
fd
=
open
(
"/dev/null"
,
O_RDWR
);
setsid
();
/* close stdin and stdout */
if
(
fd
!=
-
1
)
{
dup2
(
fd
,
0
);
dup2
(
fd
,
1
);
close
(
fd
);
}
}
else
{
if
(
stdin_fd
!=
-
1
)
dup2
(
stdin_fd
,
0
);
if
(
stdout_fd
!=
-
1
)
dup2
(
stdout_fd
,
1
);
set_stdio_fd
(
-
1
,
-
1
);
/* close stdin and stdout */
}
else
set_stdio_fd
(
stdin_fd
,
stdout_fd
);
if
(
stdin_fd
!=
-
1
)
close
(
stdin_fd
);
if
(
stdout_fd
!=
-
1
)
close
(
stdout_fd
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment