isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move check for maxfd == -1 to flush_output where it belongs.

Browse Source
This commit is contained in:
Todd C. Miller
2010-05-20 17:34:53 -04:00
parent d18b458e1f
commit a9a16d7331
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/script.c
View File

@@ -1122,8 +1122,6 @@ script_child(const char *path, char *argv[], char *envp[], int backchannel, int
if (errpipe[0] != -1) if (errpipe[0] != -1)
FD_SET(errpipe[0], fdsr); FD_SET(errpipe[0], fdsr);
maxfd = MAX(errpipe[0], backchannel); maxfd = MAX(errpipe[0], backchannel);
if (maxfd == -1)
goto done;
if (recvsig[SIGCHLD]) if (recvsig[SIGCHLD])
continue; continue;
@@ -1201,6 +1199,8 @@ flush_output(struct io_buffer *iobufs)
if (iob->wfd > maxfd) if (iob->wfd > maxfd)
maxfd = iob->wfd; maxfd = iob->wfd;
} }
if (maxfd == -1)
return;
fdsr = (fd_set *)emalloc2(howmany(maxfd + 1, NFDBITS), sizeof(fd_mask)); fdsr = (fd_set *)emalloc2(howmany(maxfd + 1, NFDBITS), sizeof(fd_mask));
fdsw = (fd_set *)emalloc2(howmany(maxfd + 1, NFDBITS), sizeof(fd_mask)); fdsw = (fd_set *)emalloc2(howmany(maxfd + 1, NFDBITS), sizeof(fd_mask));