Browse Source

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@
OPENBSD_5_7
jsg 10 years ago
parent
commit
7f4721fbaf
1 changed files with 4 additions and 1 deletions
  1. +4
    -1
      src/usr.sbin/ntpd/parse.y

+ 4
- 1
src/usr.sbin/ntpd/parse.y View File

@ -1,4 +1,4 @@
/* $OpenBSD: parse.y,v 1.54 2014/11/14 03:20:37 doug Exp $ */
/* $OpenBSD: parse.y,v 1.55 2014/11/20 05:51:20 jsg Exp $ */
/* /*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -520,6 +520,9 @@ yylex(void)
} else if (c == quotec) { } else if (c == quotec) {
*p = '\0'; *p = '\0';
break; break;
} else if (c == '\0') {
yyerror("syntax error");
return (findeol());
} }
if (p + 1 >= buf + sizeof(buf) - 1) { if (p + 1 >= buf + sizeof(buf) - 1) {
yyerror("string too long"); yyerror("string too long");


Loading…
Cancel
Save