Browse Source

conf: fix panic when integer keys are used (#865)

pull/883/head
aler9 4 years ago
parent
commit
f45abfb203
  1. 30
      internal/conf/conf.go

30
internal/conf/conf.go

@ -66,27 +66,41 @@ func loadFromFile(fpath string, conf *Conf) (bool, error) { @@ -66,27 +66,41 @@ func loadFromFile(fpath string, conf *Conf) (bool, error) {
}
// convert interface{} keys into string keys to avoid JSON errors
var convert func(i interface{}) interface{}
convert = func(i interface{}) interface{} {
var convert func(i interface{}) (interface{}, error)
convert = func(i interface{}) (interface{}, error) {
switch x := i.(type) {
case map[interface{}]interface{}:
m2 := map[string]interface{}{}
for k, v := range x {
m2[k.(string)] = convert(v)
ks, ok := k.(string)
if !ok {
return nil, fmt.Errorf("integer keys are not supported (%v)", k)
}
m2[ks], err = convert(v)
if err != nil {
return nil, err
}
}
return m2
return m2, nil
case []interface{}:
a2 := make([]interface{}, len(x))
for i, v := range x {
a2[i] = convert(v)
a2[i], err = convert(v)
if err != nil {
return nil, err
}
}
return a2
return a2, nil
}
return i
return i, nil
}
temp, err = convert(temp)
if err != nil {
return false, err
}
temp = convert(temp)
// check for non-existent parameters
var checkNonExistentFields func(what interface{}, ref interface{}) error

Loading…
Cancel
Save