add nil check

3a969bc0 · Craig Peterson · 425f6114 · 3a969bc0
Commit 3a969bc0 authored Oct 13, 2017 by Craig Peterson
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

caddyfile/parse.go caddyfile/parse.go +1 -1

No files found.
--- a/caddyfile/parse.go
+++ b/caddyfile/parse.go
@@ -247,7 +247,7 @@ func (p *parser) doImport() error {
 	var importedTokens []Token
 	// first check macros. That is a simple, non-recursive replacement
-	if p.definedMacros[importPattern] != nil {
+	if p.definedMacros != nil && p.definedMacros[importPattern] != nil {
 		importedTokens = p.definedMacros[importPattern]
 	} else {
 		// make path relative to Caddyfile rather than current working directory (issue #867)