summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authortruckman <truckman@FreeBSD.org>2016-06-08 05:32:39 +0000
committertruckman <truckman@FreeBSD.org>2016-06-08 05:32:39 +0000
commit7f608aeba98bd17fec002846907ff09fb14e9534 (patch)
tree5c16c6877f06b04bd67c6598ec8a8f63c02c42c9 /bin
parentef4ada7b7665029bd2c1c35e80c1a18df361b214 (diff)
downloadFreeBSD-src-7f608aeba98bd17fec002846907ff09fb14e9534.zip
FreeBSD-src-7f608aeba98bd17fec002846907ff09fb14e9534.tar.gz
Explicitly NUL terminate the buffer filled by fread().
The fix in r300649 was not sufficient to convince Coverity that the buffer was NUL terminated, even with the buffer pre-zeroed. Swap the size and nmemb arguments to fread() so that a valid lenght is returned, which we can use to terminate the string in the buffer at the correct location. This should also quiet the complaint about the return value of fread() not being checked. Reported by: Coverity CID: 1019054, 1009614 MFC after: 1 week
Diffstat (limited to 'bin')
-rw-r--r--bin/setfacl/file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/setfacl/file.c b/bin/setfacl/file.c
index e5e19a2..7499f1c 100644
--- a/bin/setfacl/file.c
+++ b/bin/setfacl/file.c
@@ -43,13 +43,12 @@ acl_t
get_acl_from_file(const char *filename)
{
FILE *file;
+ size_t len;
char buf[BUFSIZ+1];
if (filename == NULL)
err(1, "(null) filename in get_acl_from_file()");
- bzero(&buf, sizeof(buf));
-
if (strcmp(filename, "-") == 0) {
if (have_stdin != 0)
err(1, "cannot specify more than one stdin");
@@ -61,7 +60,8 @@ get_acl_from_file(const char *filename)
err(1, "fopen() %s failed", filename);
}
- fread(buf, sizeof(buf) - 1, (size_t)1, file);
+ len = fread(buf, (size_t)1, sizeof(buf) - 1, file);
+ buf[len] = '\0';
if (ferror(file) != 0) {
fclose(file);
err(1, "error reading from %s", filename);
OpenPOWER on IntegriCloud