add nil check

jimjimovich · Oct 13, 2017 · 3a969bc · 3a969bc
1 parent 425f611
commit 3a969bc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)