From a8ec5f1d09205f5a699031271150f978ab711848 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 21 May 2009 19:38:51 +0000
Subject: stat(2) files before trying to load them to avoid problems, for
 example with "source-file /dev/zero".

This commit dedicated to Tom: protecting idiots from their own stupidity for more than 20 years.
---
 cfg.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'cfg.c')

diff --git a/cfg.c b/cfg.c
index 2a45c393..e0f3f2a3 100644
--- a/cfg.c
+++ b/cfg.c
@@ -1,4 +1,4 @@
-/* $Id: cfg.c,v 1.15 2009-03-31 22:23:43 nicm Exp $ */
+/* $Id: cfg.c,v 1.16 2009-05-21 19:38:51 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -17,6 +17,7 @@
  */
 
 #include <sys/types.h>
+#include <sys/stat.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -55,11 +56,21 @@ load_cfg(const char *path, char **cause)
 {
 	FILE   	        *f;
 	u_int		 n;
+	struct stat	 sb;
 	char	        *buf, *line, *ptr;
 	size_t		 len;
 	struct cmd_list	*cmdlist;
 	struct cmd_ctx	 ctx;
 
+	if (stat(path, &sb) != 0) {
+		xasprintf(cause, "%s: %s", path, strerror(errno));
+		return (-1);
+	}
+	if (!S_ISREG(sb.st_mode)) {
+		xasprintf(cause, "%s: not a regular file", path);
+		return (-1);
+	}
+
 	if ((f = fopen(path, "rb")) == NULL) {
 		xasprintf(cause, "%s: %s", path, strerror(errno));
 		return (1);
-- 
cgit