diff options
| author | Sebastian Benoit <benno@cvs.openbsd.org> | 2016-06-21 21:35:26 +0000 |
|---|---|---|
| committer | Sebastian Benoit <benno@cvs.openbsd.org> | 2016-06-21 21:35:26 +0000 |
| commit | f2ada2db1464df13335d236529c834c378ced993 (patch) | |
| tree | a15cd06b17ca32de9b75238620437773f018ecdf /usr.sbin/httpd/parse.y | |
| parent | 05fc6735d59f44db060a9d3a428944db3e862ebe (diff) | |
do not allow whitespace in macro names, i.e. "this is" = "a variable".
change this in all config parsers in our tree that support macros.
problem reported by sven falempin.
feedback from henning@, stsp@, deraadt@
ok florian@ mikeb@
Diffstat (limited to 'usr.sbin/httpd/parse.y')
| -rw-r--r-- | usr.sbin/httpd/parse.y | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y index 080f3192511..2995f8908fd 100644 --- a/usr.sbin/httpd/parse.y +++ b/usr.sbin/httpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.77 2015/11/22 13:27:13 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.78 2016/06/21 21:35:24 benno Exp $ */ /* * Copyright (c) 2007 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -171,6 +171,14 @@ include : INCLUDE STRING { ; varset : STRING '=' STRING { + char *s = $1; + while (*s++) { + if (isspace((unsigned char)*s)) { + yyerror("macro name cannot contain " + "whitespace"); + YYERROR; + } + } if (symset($1, $3, 0) == -1) fatal("cannot store variable"); free($1); |