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

Handle read() returning -1 when creating temporary files.

Browse Source 
Coverity CID 104100
This commit is contained in:
Todd C. Miller
2016-05-04 12:48:17 -06:00
parent 20ff6023aa
commit 6ea903623b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sudo_edit.c
View File

@@ -559,17 +559,22 @@ sudo_edit_create_tfiles(struct command_details *command_details,
debug_return_int(-1); debug_return_int(-1);
} }
if (ofd != -1) { if (ofd != -1) {
while ((nread = read(ofd, buf, sizeof(buf))) != 0) { while ((nread = read(ofd, buf, sizeof(buf))) > 0) {
if ((nwritten = write(tfd, buf, nread)) != nread) { if ((nwritten = write(tfd, buf, nread)) != nread) {
if (nwritten == -1) if (nwritten == -1)
sudo_warn("%s", tf[j].tfile); sudo_warn("%s", tf[j].tfile);
else else
sudo_warnx(U_("%s: short write"), tf[j].tfile); sudo_warnx(U_("%s: short write"), tf[j].tfile);
break;
}
}
if (nread != 0) {
if (nread < 0)
sudo_warn("%s", files[i]);
close(ofd); close(ofd);
close(tfd); close(tfd);
debug_return_int(-1); debug_return_int(-1);
} }
}
close(ofd); close(ofd);
} }
/* /*