mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-05 14:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Do not modify Node argument passed to initInlineModule

Browse source 
It causes config.Map state to be corrupted which make some
directives "disappear".

Closes #84.
This commit is contained in:
fox.cpp 2019-05-28 20:32:15 +03:00
parent 8d63b50750
commit 5df1dad72c
No known key found for this signature in database
GPG key ID: E76D97CCEDE90B6C
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config.go
View file

@ -48,11 +48,12 @@ func initInlineModule(modObj module.Module, globals map[string]interface{}, node
// //
// Expected: modName modArgs { ... } // Expected: modName modArgs { ... }
// Actual: something modName modArgs { ... } // Actual: something modName modArgs { ... }
node.Name = node.Args[0] nodeCpy := *node
node.Args = node.Args[1:] nodeCpy.Name = node.Args[0]
nodeCpy.Args = node.Args[1:]
log.Debugln("module init", modObj.Name(), modObj.InstanceName(), "(inline)") log.Debugln("module init", modObj.Name(), modObj.InstanceName(), "(inline)")
return modObj.Init(config.NewMap(globals, node)) return modObj.Init(config.NewMap(globals, &nodeCpy))
} }
func deliverDirective(m *config.Map, node *config.Node) (interface{}, error) { func deliverDirective(m *config.Map, node *config.Node) (interface{}, error) {

1
config/map.go
View file

@ -303,6 +303,7 @@ func (m *Map) Float(name string, inheritGlobal, required bool, defaultVal float6
// mapper is a function that should convert configuration directive arguments // mapper is a function that should convert configuration directive arguments
// into variable value. Both functions may fail with errors, configuration // into variable value. Both functions may fail with errors, configuration
// processing will stop immediately then. // processing will stop immediately then.
// Note: mapper function should not modify passed values.
// //
// store is where the value returned by mapper should be stored. Can be nil // store is where the value returned by mapper should be stored. Can be nil
// (value will be saved only in Map.Values). // (value will be saved only in Map.Values).