X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=conffile.fl;h=7228c9e8fa6cd672ea5a3ac480d8328fc161cede;hp=66caa1f04cb9d789aa3f499cc28fbf948ff52dd3;hb=76f7ef9c6d027f024d432c7d06c278a3e5efae33;hpb=4f5e39ecfaa49376b0a5c3a4c384e91a828c1105

diff --git a/conffile.fl b/conffile.fl
index 66caa1f..7228c9e 100644
--- a/conffile.fl
+++ b/conffile.fl
@@ -1,7 +1,13 @@
 /* the "incl" state is used for picking up the name of an include file */
 %x incl
 
+%option nounput
+%option noinput
+%option never-interactive
+
 %{
+#include <assert.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -23,14 +29,14 @@ do{									\
 #define MAX_INCLUDE_DEPTH 10
 struct include_stack_item {
 	YY_BUFFER_STATE bst;
-	uint32_t lineno;
-	string_t file;
+	int lineno;
+	cstring_t file;
 };
 struct include_stack_item include_stack[MAX_INCLUDE_DEPTH];
 int include_stack_ptr=0;
 
-uint32_t config_lineno=0;
-string_t config_file="xxx";
+int config_lineno=0;
+cstring_t config_file="xxx";
 
 static struct p_node *leafnode(uint32_t type)
 {
@@ -65,8 +71,25 @@ static struct p_node *stringnode(string_t string)
 static struct p_node *numnode(string_t number)
 {
 	struct p_node *r;
+	unsigned long n;
 	r=leafnode(T_NUMBER);
-	r->data.number=atoi(number);
+	errno = 0;
+	n = strtoul(number, NULL, 10);
+	/* The caller is expected to only give us [0-9]+,
+	 * so we skip some of the usual syntax checking. */
+	r->data.number=n;
+	/* Give a consistent error message for any kind of
+	 * out-of-range condition */
+	if(errno == ERANGE || n != r->data.number) {
+	    Message(M_FATAL,"config file %s line %d: '%s' is too big\n",
+		    config_file, config_lineno, number);
+	    exit(1);
+	}
+	if(errno) {
+	    Message(M_FATAL,"config file %s line %d: '%s': %s\n",
+		    config_file, config_lineno, number, strerror(errno));
+	    exit(1);
+	}
 	return r;
 }
 
@@ -92,6 +115,15 @@ include			BEGIN(incl);
 	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
 	BEGIN(INITIAL);
 	}
+<incl>\n		{ /* include with no filename */
+	Message(M_FATAL,"config file %s line %d: %s\n",config_file,
+		config_lineno,"``include'' requires a filename");
+	BEGIN(INITIAL);
+	assert(config_lineno < INT_MAX);
+	++config_lineno;
+	++yynerrs;
+}
+
 <<EOF>>		{
 	if (--include_stack_ptr < 0) {
 		yyterminate();