From 7bfdbca59613182ce7f7a5e1082fc1e76f612783 Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Wed, 11 May 2016 22:04:28 +0000 Subject: [PATCH] random(6): Fix double-close In the case where a file lacks a trailing newline, there is some "evil" code to reverse goto the tokenizing code ("make_token") for the final token in the file. In this case, 'fd' is closed more than once. Use a negative sentinel value to guard close(2), preventing the double close. Ideally, this code would be restructured to avoid this ugly construction. Reported by: Coverity CID: 1006123 Sponsored by: EMC / Isilon Storage Division --- usr.bin/random/randomize_fd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.bin/random/randomize_fd.c b/usr.bin/random/randomize_fd.c index f66b9654d281..622bfc087519 100644 --- a/usr.bin/random/randomize_fd.c +++ b/usr.bin/random/randomize_fd.c @@ -174,7 +174,7 @@ randomize_fd(int fd, int type, int unique, double denom) if ((type == RANDOM_TYPE_LINES && buf[i] == '\n') || (type == RANDOM_TYPE_WORDS && isspace(buf[i])) || (eof && i == buflen - 1)) { - make_token: +make_token: if (numnode == RANDOM_MAX_PLUS1) { errno = EFBIG; err(1, "too many delimiters"); @@ -199,7 +199,10 @@ randomize_fd(int fd, int type, int unique, double denom) } } - (void)close(fd); + if (fd >= 0) { + (void)close(fd); + fd = -1; + } /* Necessary evil to compensate for files that don't end with a newline */ if (bufc != i) {