community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better handle recursive includes

This commit is contained in:
Miek Gieben 2012-01-21 23:46:53 +01:00
parent 01cb137157
commit 698660270a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zscan.go
View File

@ -117,9 +117,6 @@ func parseZone(r io.Reader, f string, t chan Token, include int) {
close(t) close(t)
} }
}() }()
if include > 7 {
t <- Token{Error: &ParseError{f, "Too deeply nested $INCLUDE", l}}
}
var s scanner.Scanner var s scanner.Scanner
c := make(chan lex) c := make(chan lex)
s.Init(r) s.Init(r)
@ -195,6 +192,10 @@ func parseZone(r io.Reader, f string, t chan Token, include int) {
t <- Token{Error: &ParseError{f, "Failed to open `" + l.token + "'", l}} t <- Token{Error: &ParseError{f, "Failed to open `" + l.token + "'", l}}
return return
} }
if include + 1 > 7 {
t <- Token{Error: &ParseError{f, "Too deeply nested $INCLUDE", l}}
return
}
parseZone(r1, l.token, t, include+1) parseZone(r1, l.token, t, include+1)
st = _EXPECT_OWNER_DIR st = _EXPECT_OWNER_DIR
case _EXPECT_DIRTTL_BL: case _EXPECT_DIRTTL_BL: