plug file descriptor leaks on read or write failure;

hinted at by Steffen Nurpmeso <sdaoden at yandex dot com>.

2 files changed, 13 insertions, 14 deletions

diff --git a/main.c b/main.c
index 9e896fd3..2451ff5e 100644
--- a/main.c
+++ b/main.c
@@ -581,14 +581,15 @@ passthrough(const char *file, int fd)
 		for (off = 0; off < nr; off += nw)
 			if ((nw = write(STDOUT_FILENO, buf + off,
 			    (size_t)(nr - off))) == -1 || nw == 0) {
+				close(fd);
 				syscall = "write";
 				goto fail;
 			}
 
-        if (nr == 0) {
-		close(fd);
+	close(fd);
+
+	if (nr == 0)
 		return(MANDOCLEVEL_OK);
-        }
 
 	syscall = "read";
 fail:
diff --git a/read.c b/read.c
index d44fc91e..101c478f 100644
--- a/read.c
+++ b/read.c
@@ -768,7 +768,7 @@ mparse_readfd(struct mparse *curp, int fd, const char *file)
 			(*curp->mmsg)(MANDOCERR_SYSOPEN,
 			    curp->file_status,
 			    file, 0, 0, strerror(errno));
-		goto out;
+		return(curp->file_status);
 	}
 
 	/*
@@ -778,21 +778,19 @@ mparse_readfd(struct mparse *curp, int fd, const char *file)
 	 * the parse phase for the file.
 	 */
 
-	if ( ! read_whole_file(curp, file, fd, &blk, &with_mmap))
-		goto out;
-
-	mparse_parse_buffer(curp, blk, file);
-
+	if (read_whole_file(curp, file, fd, &blk, &with_mmap)) {
+		mparse_parse_buffer(curp, blk, file);
 #if HAVE_MMAP
-	if (with_mmap)
-		munmap(blk.buf, blk.sz);
-	else
+		if (with_mmap)
+			munmap(blk.buf, blk.sz);
+		else
 #endif
-		free(blk.buf);
+			free(blk.buf);
+	}
 
 	if (STDIN_FILENO != fd && -1 == close(fd))
 		perror(file);
-out:
+
 	return(curp->file_status);
 }