d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tftpd: misc Coverity cleanup in the tests

Browse Source 
A bunch of unchecked return values from open(2) and read(2)

Reported by:	Coverity
CID:		1386900, 1386911, 1386926, 1386928, 1386932, 1386942
CID:		1386961, 1386979
MFC after:	8 days
X-MFC-With:	330696
This commit is contained in:
Alan Somers 2018-03-22 14:51:05 +00:00
parent 555deb3c96
commit ad5c8bd63a
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libexec/tftpd/tests/functional.c
View File

@ -224,19 +224,17 @@ do { \
static void
cleanup(void)
{
int fd = -1;
char buffer[80] = {0};
FILE *f;
pid_t pid;
fd = open(pidfile, O_RDONLY);
if (fd < 0)
f = fopen(pidfile, "r");
if (f == NULL)
return;
if (read(fd, buffer, sizeof(buffer)) > 0) {
sscanf(buffer, "%d", &pid);
if (fscanf(f, "%d", &pid) == 1) {
kill(pid, SIGTERM);
waitpid(pid, NULL, 0);
}
close(fd);
fclose(f);
unlink(pidfile);
}
@ -698,6 +696,7 @@ TFTPD_TC_DEFINE(w_flag,, w_flag = 1;)
recv_ack(1);
fd = open("small.txt", O_RDONLY);
ATF_REQUIRE(fd >= 0);
r = read(fd, buffer, sizeof(buffer));
close(fd);
require_bufeq(contents, contents_len, buffer, r);
@ -734,6 +733,7 @@ TFTPD_TC_DEFINE(wrq_dropped_ack,)
recv_ack(2);
fd = open("medium.txt", O_RDONLY);
ATF_REQUIRE(fd >= 0);
r = read(fd, buffer, sizeof(buffer));
close(fd);
require_bufeq((const char*)contents, 768, buffer, r);
@ -766,6 +766,7 @@ TFTPD_TC_DEFINE(wrq_dropped_data,)
recv_ack(1);
fd = open("small.txt", O_RDONLY);
ATF_REQUIRE(fd >= 0);
r = read(fd, buffer, sizeof(buffer));
close(fd);
require_bufeq(contents, contents_len, buffer, r);
@ -799,6 +800,7 @@ TFTPD_TC_DEFINE(wrq_duped_data,)
recv_ack(2);
fd = open("medium.txt", O_RDONLY);
ATF_REQUIRE(fd >= 0);
r = read(fd, buffer, sizeof(buffer));
close(fd);
require_bufeq((const char*)contents, 768, buffer, r);
@ -862,6 +864,7 @@ TFTPD_TC_DEFINE(wrq_medium,)
recv_ack(2);
fd = open("medium.txt", O_RDONLY);
ATF_REQUIRE(fd >= 0);
r = read(fd, buffer, sizeof(buffer));
close(fd);
require_bufeq((const char*)contents, 768, buffer, r);
@ -894,6 +897,7 @@ TFTPD_TC_DEFINE(wrq_netascii,)
recv_ack(1);
fd = open("unix.txt", O_RDONLY);
ATF_REQUIRE(fd >= 0);
r = read(fd, buffer, sizeof(buffer));
close(fd);
require_bufeq(expected, sizeof(expected), buffer, r);
@ -931,6 +935,7 @@ TFTPD_TC_DEFINE(wrq_small,)
recv_ack(1);
fd = open("small.txt", O_RDONLY);
ATF_REQUIRE(fd >= 0);
r = read(fd, buffer, sizeof(buffer));
close(fd);
require_bufeq(contents, contents_len, buffer, r);