Merge pull request #10 from Fenny/master

Fenny · web-flow · commit 4bb9b7be8b62 · 2020-06-12T13:23:30.000+02:00
Fix panic in nil map
diff --git a/handlebars/handlebars.go b/handlebars/handlebars.go
@@ -174,10 +174,10 @@ func (e *Engine) Render(out io.Writer, template string, binding interface{}, lay
 			return fmt.Errorf("render: layout %s does not exist", layout[0])
 		}
 		var bind map[string]interface{}
-		if binding == nil {
-			bind = make(map[string]interface{}, 1)
-		} else if m, ok := binding.(map[string]interface{}); ok {
+		if m, ok := binding.(map[string]interface{}); ok {
 			bind = m
+		} else {
+			bind = make(map[string]interface{}, 1)
 		}
 		bind[e.layout] = raymond.SafeString(parsed)
 		parsed, err := lay.Exec(bind)

Original file line number	Diff line number	Diff line change
`@@ -174,10 +174,10 @@ func (e *Engine) Render(out io.Writer, template string, binding interface{}, lay`
`174`	`174`	`return fmt.Errorf("render: layout %s does not exist", layout[0])`
`175`	`175`	`}`
`176`	`176`	`var bind map[string]interface{}`
`177`		`- if binding == nil {`
`178`		`- bind = make(map[string]interface{}, 1)`
`179`		`- } else if m, ok := binding.(map[string]interface{}); ok {`
	`177`	`+ if m, ok := binding.(map[string]interface{}); ok {`
`180`	`178`	`bind = m`
	`179`	`+ } else {`
	`180`	`+ bind = make(map[string]interface{}, 1)`
`181`	`181`	`}`
`182`	`182`	`bind[e.layout] = raymond.SafeString(parsed)`
`183`	`183`	`parsed, err := lay.Exec(bind)`