From ef55bfa6b2e2379c635289d2cc549bbf8cb91e67 Mon Sep 17 00:00:00 2001 From: okan Date: Sat, 17 Jan 2015 02:05:03 +0000 Subject: [PATCH] Catch up with src parse.y changes by jsg@: 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@ --- app/cwm/parse.y | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/cwm/parse.y b/app/cwm/parse.y index 63b5def89..2ee5727bb 100644 --- a/app/cwm/parse.y +++ b/app/cwm/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.59 2015/01/16 18:28:08 okan Exp $ */ +/* $OpenBSD: parse.y,v 1.60 2015/01/17 02:05:03 okan Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer @@ -438,6 +438,9 @@ yylex(void) } 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");