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

In io_callback() make sure we clear SUDO_EV_READ if we close the

Browse Source 
fd.  It should not be possible for SUDO_EV_READ to be set when
revent is non-NULL but this makes static analyzers happier.
Coverity CID 104124.
This commit is contained in:
Todd C. Miller
2016-05-07 14:51:37 -06:00
parent 194c7c8069
commit 094854adfe
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/exec_pty.c
View File

@@ -562,11 +562,12 @@ io_callback(int fd, int what, void *v)
sudo_debug_printf(SUDO_DEBUG_INFO, sudo_debug_printf(SUDO_DEBUG_INFO,
"unable to write %d bytes to fd %d", "unable to write %d bytes to fd %d",
iob->len - iob->off, fd); iob->len - iob->off, fd);
/* Close reader if there is one. */
if (iob->revent != NULL) { if (iob->revent != NULL) {
CLR(what, SUDO_EV_READ);
safe_close(sudo_ev_get_fd(iob->revent)); safe_close(sudo_ev_get_fd(iob->revent));
ev_free_by_fd(evbase, sudo_ev_get_fd(iob->revent)); ev_free_by_fd(evbase, sudo_ev_get_fd(iob->revent));
} }
CLR(what, SUDO_EV_READ);
safe_close(fd); safe_close(fd);
ev_free_by_fd(evbase, fd); ev_free_by_fd(evbase, fd);
break; break;
@@ -592,11 +593,11 @@ io_callback(int fd, int what, void *v)
/* Reset buffer if fully consumed. */ /* Reset buffer if fully consumed. */
if (iob->off == iob->len) { if (iob->off == iob->len) {
iob->off = iob->len = 0; iob->off = iob->len = 0;
/* If reader is gone, close and remove writer; we are done. */ /* Forward the EOF from reader to writer. */
if (iob->revent == NULL) { if (iob->revent == NULL) {
CLR(what, SUDO_EV_READ);
safe_close(fd); safe_close(fd);
ev_free_by_fd(evbase, fd); ev_free_by_fd(evbase, fd);
debug_return;
} }
} }
/* Re-enable writer if buffer is not empty. */ /* Re-enable writer if buffer is not empty. */