gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

check for failure of dup/dup2 even though it will never happen

Browse source
This commit is contained in:
Richard Frith-Macdonald 2018-02-04 11:36:06 +00:00
parent 54bf6598ed
commit 546deb4604
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Source/NSTask.m
View file

@ -1614,12 +1614,12 @@ GSPrivateCheckTasks()
/* Set up stdin, stdout and stderr by duplicating descriptor as
* necessary and closing the original.
*/
dup2(s, 0);
dup2(s, 1);
dup2(s, 2);
if (dup2(s, 0) != 0) exit(1);
if (dup2(s, 1) != 1) exit(1);
if (dup2(s, 2) != 2) exit(1);
if (s != 0 && s != 1 && s != 2)
{
close(s);
(void)close(s);
}
}
else
@ -1630,15 +1630,15 @@ GSPrivateCheckTasks()
*/
if (idesc != 0)
{
dup2(idesc, 0);
if (dup2(idesc, 0) != 0) exit(1);
}
if (odesc != 1)
{
dup2(odesc, 1);
if (dup2(odesc, 1) != 1) exit(1);
}
if (edesc != 2)
{
dup2(edesc, 2);
if (dup2(edesc, 2) != 2) exit(1);
}
}
@ -1650,8 +1650,8 @@ GSPrivateCheckTasks()
(void) close(i);
}
chdir(path);
execve(executable, (char**)args, (char**)envl);
(void)chdir(path);
(void)execve(executable, (char**)args, (char**)envl);
exit(-1);
}
else
@ -1746,6 +1746,7 @@ GSPrivateCheckTasks()
- (BOOL) usePseudoTerminal
{
int desc;
int master;
NSFileHandle *fh;
@ -1762,13 +1763,21 @@ GSPrivateCheckTasks()
closeOnDealloc: YES];
[self setStandardInput: fh];
RELEASE(fh);
master = dup(master);
fh = [[NSFileHandle alloc] initWithFileDescriptor: master
if ((desc = dup(master)) < 0)
{
return NO;
}
fh = [[NSFileHandle alloc] initWithFileDescriptor: desc
closeOnDealloc: YES];
[self setStandardOutput: fh];
RELEASE(fh);
master = dup(master);
fh = [[NSFileHandle alloc] initWithFileDescriptor: master
if ((desc = dup(master)) < 0)
{
return NO;
}
fh = [[NSFileHandle alloc] initWithFileDescriptor: desc
closeOnDealloc: YES];
[self setStandardError: fh];
RELEASE(fh);