From 526655bfc9928c3519a08eba2fbeb5806ae387df Mon Sep 17 00:00:00 2001
From: okan
Date: Sat, 17 Jan 2015 02:05:03 +0000
Subject: 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@
---
 parse.y | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 63b5def..2ee5727 100644
--- a/parse.y
+++ b/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 <henning@openbsd.org>
@@ -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");
-- 
cgit v1.2.3-2-gb3c3