diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-11-20 05:51:22 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-11-20 05:51:22 +0000 |
| commit | 2eaa981b579a68f8adabaad74640807821ddd131 (patch) | |
| tree | b12cf2076861693c4d14b3a5130ee1ff2dca4fc8 /usr.sbin/httpd/parse.y | |
| parent | 6a369f972afd1add899318b0d0d9d2b2877778e0 (diff) | |
Don't allow embedded nul characters in strings.
Fixes a pfctl crash with an anchor name containing
an embedded nul found with the afl fuzzer.
pfctl parse.y patch from and ok deraadt@
Diffstat (limited to 'usr.sbin/httpd/parse.y')
| -rw-r--r-- | usr.sbin/httpd/parse.y | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y index cfb60ae7da4..6aa156ecdb8 100644 --- a/usr.sbin/httpd/parse.y +++ b/usr.sbin/httpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.41 2014/11/11 15:54:45 beck Exp $ */ +/* $OpenBSD: parse.y,v 1.42 2014/11/20 05:51:20 jsg Exp $ */ /* * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -1066,6 +1066,9 @@ top: } else if (c == quotec) { *p = '\0'; break; + } else if (c == '\0') { + yyerror("syntax error"); + return (findeol()); } if (p + 1 >= buf + sizeof(buf) - 1) { yyerror("string too long"); |